Commit 688f3b71 authored by Olivier Cros's avatar Olivier Cros

Fix commit 2615

Bugs corrections with cancelling tabulations and misplaced backslashes.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2616 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 7850ebec
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
import neo.lib import neo.lib
from neo.lib.protocol import NodeTypes, Packets from neo.lib.protocol import NodeTypes, Packets
from neo.lib.protocol import NotReadyError, ProtocolError, from neo.lib.protocol import NotReadyError, ProtocolError, \
UnexpectedPacketError UnexpectedPacketError
from neo.lib.protocol import BrokenNodeDisallowedError from neo.lib.protocol import BrokenNodeDisallowedError
from neo.master.handlers import MasterHandler from neo.master.handlers import MasterHandler
......
...@@ -25,8 +25,8 @@ class IdentificationHandler(MasterHandler): ...@@ -25,8 +25,8 @@ class IdentificationHandler(MasterHandler):
"""This class deals with messages from the admin node only""" """This class deals with messages from the admin node only"""
def nodeLost(self, conn, node): def nodeLost(self, conn, node):
neo.lib.logging.warning(' neo.lib.logging.warning(
lost a node in IdentificationHandler : %s' % node) 'lost a node in IdentificationHandler : %s' % node)
def requestIdentification(self, conn, node_type, uuid, address, name): def requestIdentification(self, conn, node_type, uuid, address, name):
......
...@@ -100,7 +100,7 @@ LOG_FILE = 'neo.log' ...@@ -100,7 +100,7 @@ LOG_FILE = 'neo.log'
# override logging configuration to send all messages to a file # override logging configuration to send all messages to a file
for logger_name in ('NEO', 'CLIENT'): for logger_name in ('NEO', 'CLIENT'):
neo.setupLog(logger_name, filename=LOG_FILE) neo.lib.setupLog(logger_name, filename=LOG_FILE)
class NeoTestRunner(unittest.TestResult): class NeoTestRunner(unittest.TestResult):
""" Custom result class to build report with statistics per module """ """ Custom result class to build report with statistics per module """
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
import unittest import unittest
from mock import Mock from mock import Mock
from neo.tests import NeoUnitTestBase from neo.tests import NeoUnitTestBase
from neo.lib.protocol import NodeTypes, NotReadyError, from neo.lib.protocol import NodeTypes, NotReadyError, \
BrokenNodeDisallowedError BrokenNodeDisallowedError
from neo.lib.pt import PartitionTable from neo.lib.pt import PartitionTable
from neo.storage.app import Application from neo.storage.app import Application
......
...@@ -19,7 +19,7 @@ import unittest ...@@ -19,7 +19,7 @@ import unittest
from mock import Mock from mock import Mock
from neo.lib import protocol from neo.lib import protocol
from neo.lib.protocol import NodeTypes, NodeStates from neo.lib.protocol import NodeTypes, NodeStates
from neo.lib.node import Node, MasterNode, StorageNode, from neo.lib.node import Node, MasterNode, StorageNode, \
ClientNode, AdminNode, NodeManager ClientNode, AdminNode, NodeManager
from neo.tests import NeoUnitTestBase from neo.tests import NeoUnitTestBase
from time import time from time import time
......
...@@ -43,7 +43,7 @@ class ZODBTestCase(NEOFunctionalTest): ...@@ -43,7 +43,7 @@ class ZODBTestCase(NEOFunctionalTest):
self._storage.cleanup() self._storage.cleanup()
self.neo.stop() self.neo.stop()
# Deconfigure client logger # Deconfigure client logger
neo.setupLog('CLIENT') neo.lib.setupLog('CLIENT')
NEOFunctionalTest.tearDown(self) NEOFunctionalTest.tearDown(self)
def open(self, read_only=False): def open(self, read_only=False):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment