[Neo-report] r2370 vincent - /trunk/neo/tests/functional/__init__.py

[nobody at svn.erp5.org]

Author: vincent
Date: Sat Oct 30 00:11:36 2010
New Revision: 2370

Log:
Stop messing with setupLog in functional tests.

Modified:
    trunk/neo/tests/functional/__init__.py

Modified: trunk/neo/tests/functional/__init__.py
==============================================================================
--- trunk/neo/tests/functional/__init__.py [iso-8859-1] (original)
+++ trunk/neo/tests/functional/__init__.py [iso-8859-1] Sat Oct 30 00:11:36 2010
@@ -34,14 +34,6 @@ from neo.util import dump
 from neo.tests import DB_ADMIN, DB_PASSWD
 
 import neo
-# Replace neo.setupLog by a no-op function.
-# This will only impact instances created in this process, so client only.
-def dummy_setupLog(*args, **kw):
-    pass
-real_setupLog = neo.setupLog
-neo.setupLog = dummy_setupLog
-# Import Storage only *after* patching neo.setupLog, as it keeps a direct
-# reference to setupLog.
 from neo.client.Storage import Storage
 
 NEO_MASTER = 'neomaster'
@@ -184,7 +176,7 @@ class NEOCluster(object):
             print 'Using temp directory %r.' % (temp_dir, )
         self.temp_dir = temp_dir
         # Setup client logger
-        real_setupLog(name='CLIENT', filename=os.path.join(self.temp_dir,
+        neo.setupLog(name='CLIENT', filename=os.path.join(self.temp_dir,
             'client.log'), verbose=self.verbose)
         admin_port = self.__allocatePort()
         self.cluster_name = 'neo_%s' % (random.randint(0, 100), )