Commit 8c554551 authored by Vincent Pelletier's avatar Vincent Pelletier

Remove all sleeps in testZODB, they are not required any more.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@774 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 4c61df28
...@@ -26,7 +26,6 @@ import transaction ...@@ -26,7 +26,6 @@ import transaction
from neo.client.Storage import Storage from neo.client.Storage import Storage
import os import os
import sys import sys
import time
import signal import signal
import MySQLdb import MySQLdb
import logging import logging
...@@ -72,9 +71,6 @@ class NEOProcess: ...@@ -72,9 +71,6 @@ class NEOProcess:
raise KeyboardInterrupt raise KeyboardInterrupt
else: else:
neo_process_list.append(self) neo_process_list.append(self)
# TODO: remove the need for this sleep. It must become possible to
# restart the cluster without any artificial delay.
time.sleep(1)
def kill(self, sig=signal.SIGTERM): def kill(self, sig=signal.SIGTERM):
if self.pid: if self.pid:
...@@ -237,9 +233,6 @@ class ZODBTests(unittest.TestCase): ...@@ -237,9 +233,6 @@ class ZODBTests(unittest.TestCase):
NEOProcess(NEO_STORAGE, '-vRc', config_file_path, '-s', 'storage2', '-l', s2_log) NEOProcess(NEO_STORAGE, '-vRc', config_file_path, '-s', 'storage2', '-l', s2_log)
NEOProcess(NEO_STORAGE, '-vRc', config_file_path, '-s', 'storage3', '-l', s3_log) NEOProcess(NEO_STORAGE, '-vRc', config_file_path, '-s', 'storage3', '-l', s3_log)
NEOProcess(NEO_STORAGE, '-vRc', config_file_path, '-s', 'storage4', '-l', s4_log) NEOProcess(NEO_STORAGE, '-vRc', config_file_path, '-s', 'storage4', '-l', s4_log)
# wait a bit during cluster startup, this is just to avoid many
# 'connection refused' messages in logs
time.sleep(5)
# Send Storage output to a logfile # Send Storage output to a logfile
self._storage = Storage( self._storage = Storage(
master_nodes=NEO_MASTER_NODES, master_nodes=NEO_MASTER_NODES,
......
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