diff options
| author | Jose <jose@zeroc.com> | 2014-12-05 11:50:45 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-05 11:50:45 +0100 |
| commit | 8f50c530c81d20bd01b6ef65622cab8b51be7636 (patch) | |
| tree | 3569639712dced86c2e880ab3a4b127c1d4087b2 /cpp | |
| parent | Don't test C# on non-default arch with VC110 (diff) | |
| download | ice-8f50c530c81d20bd01b6ef65622cab8b51be7636.tar.bz2 ice-8f50c530c81d20bd01b6ef65622cab8b51be7636.tar.xz ice-8f50c530c81d20bd01b6ef65622cab8b51be7636.zip | |
IceStorm & TestUtil scripts timeout fixes
Diffstat (limited to 'cpp')
| -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 |
3 files changed, 3 insertions, 3 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") # |