diff options
| -rwxr-xr-x | cpp/test/IceStorm/federation2/run.py | 2 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/rep1/run.py | 2 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/single/run.py | 2 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index 491fc0438f3..649bce47123 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -58,7 +58,7 @@ def doTest(icestorm1, icestorm2, batch, subscriberRef = None): # runPublisher(icestorm1) - subscriberProc.waitTestSuccess(timeout=30) + subscriberProc.waitTestSuccess() # # Test #1: diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py index 6e3c4cc74ea..a49c39e7f40 100755 --- a/cpp/test/IceStorm/rep1/run.py +++ b/cpp/test/IceStorm/rep1/run.py @@ -45,7 +45,7 @@ def runtest(opt, ref, subopt="", pubopt=""): subscriberProc = runsub(opt, ref, subopt) publisherProc = runpub(ref, pubopt) publisherProc.waitTestSuccess() - subscriberProc.waitTestSuccess(timeout=30) + subscriberProc.waitTestSuccess() def runsub2(replica = -1, expect = None): proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0, echo = False) diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index 17037cc44d5..8d465b031d5 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -42,7 +42,7 @@ def dotest(type): sys.stdout.write("starting subscriber... ") sys.stdout.flush() - subscriberProc = TestUtil.startServer(subscriber, icestorm.reference(), count = 3, timeout = 30) + subscriberProc = TestUtil.startServer(subscriber, icestorm.reference(), count = 3) print("ok") # diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 62bdce5fb15..5665dc9c066 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1241,7 +1241,7 @@ def spawnClient(cmd, env=None, cwd=None, echo=True, startReader=True, lang=None) client.trace() return client -def spawnServer(cmd, env=None, cwd=None, count=1, adapter=None, echo=True, lang=None, mx=False, timeout=20): +def spawnServer(cmd, env=None, cwd=None, count=1, adapter=None, echo=True, lang=None, mx=False, timeout=60): server = _spawn(cmd, env, cwd, lang=lang) # Count + 1 if IceMX enabled @@ -1638,7 +1638,7 @@ def startClient(exe, args = "", config=None, env=None, echo = True, startReader phpSetup(clientConfig, iceOptions, iceProfile) return spawnClient(cmd, env = env, echo = echo, startReader = startReader, lang=config.lang) -def startServer(exe, args = "", config = None, env = None, adapter = None, count = 1, echo = True, timeout = 20): +def startServer(exe, args = "", config = None, env = None, adapter = None, count = 1, echo = True, timeout = 60): if config is None: config = DriverConfig("server") if env is None: |