[Neo-report] r2683 jm - in /trunk/neo: lib/logger.py tests/__init__.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 22 15:54:58 CET 2011
Author: jm
Date: Tue Mar 22 15:54:58 2011
New Revision: 2683
Log:
Always enable packet logger in unit tests
Modified:
trunk/neo/lib/logger.py
trunk/neo/tests/__init__.py
Modified: trunk/neo/lib/logger.py
==============================================================================
--- trunk/neo/lib/logger.py [iso-8859-1] (original)
+++ trunk/neo/lib/logger.py [iso-8859-1] Tue Mar 22 15:54:58 2011
@@ -30,8 +30,12 @@ class PacketLogger(object):
_temp = EventHandler(None)
self.packet_dispatch_table = _temp.packet_dispatch_table
self.error_dispatch_table = _temp.error_dispatch_table
+ self.enable(LOGGER_ENABLED)
- def dispatch(self, conn, packet, direction):
+ def enable(self, enabled):
+ self.dispatch = enabled and self._dispatch or (lambda *args, **kw: None)
+
+ def _dispatch(self, conn, packet, direction):
"""This is a helper method to handle various packet types."""
# default log message
klass = packet.getType()
@@ -70,6 +74,3 @@ class PacketLogger(object):
neo.lib.logging.debug(' ! %s | %8s | %22s | %s' % node)
PACKET_LOGGER = PacketLogger()
-if not LOGGER_ENABLED:
- # disable logger
- PACKET_LOGGER.dispatch = lambda *args, **kw: None
Modified: trunk/neo/tests/__init__.py
==============================================================================
--- trunk/neo/tests/__init__.py [iso-8859-1] (original)
+++ trunk/neo/tests/__init__.py [iso-8859-1] Tue Mar 22 15:54:58 2011
@@ -26,7 +26,7 @@ import MySQLdb
import neo
from mock import Mock
-from neo.lib import live_debug, protocol
+from neo.lib import live_debug, logger, protocol
from neo.lib.protocol import Packets
from neo.lib.util import getAddressType
from time import time, gmtime, sleep
@@ -48,6 +48,7 @@ live_debug.ENABLED = True
live_debug.register()
# prevent "signal only works in main thread" errors in subprocesses
live_debug.ENABLED = False
+logger.PACKET_LOGGER.enable(True)
def buildUrlFromString(address):
try:
More information about the Neo-report
mailing list