Commit 4a50b1c3 authored by Julien Muchembled's avatar Julien Muchembled

tests: minor fixup to r2736 & r2738

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2739 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 5e9af25c
...@@ -165,13 +165,10 @@ class NEOProcess(object): ...@@ -165,13 +165,10 @@ class NEOProcess(object):
try: try:
sys.argv = [command] + args sys.argv = [command] + args
getattr(neo.scripts, command).main() getattr(neo.scripts, command).main()
sys.exit()
except: except:
raise ChildException(*sys.exc_info()) 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): def kill(self, sig=signal.SIGTERM):
if self.pid: if self.pid:
try: try:
......
...@@ -42,8 +42,6 @@ class ZODBTestCase(NEOFunctionalTest): ...@@ -42,8 +42,6 @@ class ZODBTestCase(NEOFunctionalTest):
def tearDown(self): def tearDown(self):
self._storage.cleanup() self._storage.cleanup()
self.neo.stop() self.neo.stop()
# Deconfigure client logger
neo.lib.setupLog('CLIENT')
NEOFunctionalTest.tearDown(self) NEOFunctionalTest.tearDown(self)
assertEquals = failUnlessEqual = NEOFunctionalTest.assertEqual assertEquals = failUnlessEqual = NEOFunctionalTest.assertEqual
......
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