[Neo-report] r2739 jm - in /trunk/neo/tests: functional/__init__.py zodb/__init__.py

[nobody at svn.erp5.org]

Author: jm
Date: Thu Apr 28 21:46:35 2011
New Revision: 2739

Log:
tests: minor fixup to r2736 & r2738

Modified:
    trunk/neo/tests/functional/__init__.py
    trunk/neo/tests/zodb/__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] Thu Apr 28 21:46:35 2011
@@ -165,13 +165,10 @@ class NEOProcess(object):
             try:
                 sys.argv = [command] + args
                 getattr(neo.scripts,  command).main()
+                sys.exit()
             except:
                 raise ChildException(*sys.exc_info())
 
-    def _exit(self, status=0):
-        sys.stdout = sys.stderr = open('/dev/null', 'w')
-        raise KeyboardInterrupt
-
     def kill(self, sig=signal.SIGTERM):
         if self.pid:
             try:

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] Thu Apr 28 21:46:35 2011
@@ -42,8 +42,6 @@ class ZODBTestCase(NEOFunctionalTest):
     def tearDown(self):
         self._storage.cleanup()
         self.neo.stop()
-        # Deconfigure client logger
-        neo.lib.setupLog('CLIENT')
         NEOFunctionalTest.tearDown(self)
 
     assertEquals = failUnlessEqual = NEOFunctionalTest.assertEqual