[Neo-report] r2616 olivier.cros - in /trunk/neo: master/handlers/ scripts/ tests/ tests/st...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jan 18 16:19:34 CET 2011
Author: olivier.cros
Date: Tue Jan 18 16:19:33 2011
New Revision: 2616
Log:
Fix commit 2615
Bugs corrections with cancelling tabulations and misplaced backslashes.
Modified:
trunk/neo/master/handlers/election.py
trunk/neo/master/handlers/identification.py
trunk/neo/scripts/runner.py
trunk/neo/tests/storage/testIdentificationHandler.py
trunk/neo/tests/testNodes.py
trunk/neo/tests/zodb/__init__.py
Modified: trunk/neo/master/handlers/election.py
==============================================================================
--- trunk/neo/master/handlers/election.py [iso-8859-1] (original)
+++ trunk/neo/master/handlers/election.py [iso-8859-1] Tue Jan 18 16:19:33 2011
@@ -18,7 +18,7 @@
import neo.lib
from neo.lib.protocol import NodeTypes, Packets
-from neo.lib.protocol import NotReadyError, ProtocolError,
+from neo.lib.protocol import NotReadyError, ProtocolError, \
UnexpectedPacketError
from neo.lib.protocol import BrokenNodeDisallowedError
from neo.master.handlers import MasterHandler
Modified: trunk/neo/master/handlers/identification.py
==============================================================================
--- trunk/neo/master/handlers/identification.py [iso-8859-1] (original)
+++ trunk/neo/master/handlers/identification.py [iso-8859-1] Tue Jan 18 16:19:33 2011
@@ -25,8 +25,8 @@ class IdentificationHandler(MasterHandle
"""This class deals with messages from the admin node only"""
def nodeLost(self, conn, node):
- neo.lib.logging.warning('
- lost a node in IdentificationHandler : %s' % node)
+ neo.lib.logging.warning(
+ 'lost a node in IdentificationHandler : %s' % node)
def requestIdentification(self, conn, node_type, uuid, address, name):
Modified: trunk/neo/scripts/runner.py
==============================================================================
--- trunk/neo/scripts/runner.py [iso-8859-1] (original)
+++ trunk/neo/scripts/runner.py [iso-8859-1] Tue Jan 18 16:19:33 2011
@@ -100,7 +100,7 @@ LOG_FILE = 'neo.log'
# override logging configuration to send all messages to a file
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):
""" Custom result class to build report with statistics per module """
Modified: trunk/neo/tests/storage/testIdentificationHandler.py
==============================================================================
--- trunk/neo/tests/storage/testIdentificationHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testIdentificationHandler.py [iso-8859-1] Tue Jan 18 16:19:33 2011
@@ -18,7 +18,7 @@
import unittest
from mock import Mock
from neo.tests import NeoUnitTestBase
-from neo.lib.protocol import NodeTypes, NotReadyError,
+from neo.lib.protocol import NodeTypes, NotReadyError, \
BrokenNodeDisallowedError
from neo.lib.pt import PartitionTable
from neo.storage.app import Application
Modified: trunk/neo/tests/testNodes.py
==============================================================================
--- trunk/neo/tests/testNodes.py [iso-8859-1] (original)
+++ trunk/neo/tests/testNodes.py [iso-8859-1] Tue Jan 18 16:19:33 2011
@@ -19,8 +19,8 @@ import unittest
from mock import Mock
from neo.lib import protocol
from neo.lib.protocol import NodeTypes, NodeStates
-from neo.lib.node import Node, MasterNode, StorageNode,
- ClientNode, AdminNode, NodeManager
+from neo.lib.node import Node, MasterNode, StorageNode, \
+ ClientNode, AdminNode, NodeManager
from neo.tests import NeoUnitTestBase
from time import time
Modified: trunk/neo/tests/zodb/__init__.py
==============================================================================
--- trunk/neo/tests/zodb/__init__.py [iso-8859-1] (original)
+++ trunk/neo/tests/zodb/__init__.py [iso-8859-1] Tue Jan 18 16:19:33 2011
@@ -43,7 +43,7 @@ class ZODBTestCase(NEOFunctionalTest):
self._storage.cleanup()
self.neo.stop()
# Deconfigure client logger
- neo.setupLog('CLIENT')
+ neo.lib.setupLog('CLIENT')
NEOFunctionalTest.tearDown(self)
def open(self, read_only=False):
More information about the Neo-report
mailing list