Bump some demoscript timeouts that could cause problems

13 files changed, 39 insertions, 39 deletions

diff --git a/cpp/demo/IceGrid/customLoadBalancing/expect.py b/cpp/demo/IceGrid/customLoadBalancing/expect.py
index 09f00e76ac0..7e1d2f9e442 100755
--- a/cpp/demo/IceGrid/customLoadBalancing/expect.py
+++ b/cpp/demo/IceGrid/customLoadBalancing/expect.py
@@ -62,7 +62,7 @@ sys.stdout.flush()
 client = Util.spawn('./client --Ice.Default.Locator.Context.currency=EUR')
 client.expect('Preferred currency configured for the client: EUR')
 client.expect('Preferred currencies of the server: .*EUR.*')
-client.waitTestSuccess(timeout=1)
+client.waitTestSuccess(timeout=120)
 print("ok")
 
 sys.stdout.write("testing preferred currency GBP... ")
@@ -70,7 +70,7 @@ sys.stdout.flush()
 client = Util.spawn('./client --Ice.Default.Locator.Context.currency=GBP')
 client.expect('Preferred currency configured for the client: GBP')
 client.expect('Preferred currencies of the server: .*GBP.*')
-client.waitTestSuccess(timeout=1)
+client.waitTestSuccess(timeout=120)
 print("ok")
 
 sys.stdout.write("testing preferred currency JPY... ")
@@ -78,7 +78,7 @@ sys.stdout.flush()
 client = Util.spawn('./client --Ice.Default.Locator.Context.currency=JPY')
 client.expect('Preferred currency configured for the client: JPY')
 client.expect('Preferred currencies of the server: .*JPY.*')
-client.waitTestSuccess(timeout=1)
+client.waitTestSuccess(timeout=120)
 print("ok")
 
 admin.sendline('registry shutdown Master')
diff --git a/cpp/demo/IceGrid/replication/expect.py b/cpp/demo/IceGrid/replication/expect.py
index d28f664c6d1..9ef0cad62f3 100755
--- a/cpp/demo/IceGrid/replication/expect.py
+++ b/cpp/demo/IceGrid/replication/expect.py
@@ -70,7 +70,7 @@ def runDemo(properties, clientProperties):
         client.sendline('x')
         client.sendline('x')
 
-        client.waitTestSuccess(timeout=1)
+        client.waitTestSuccess(timeout=120)
 
     sys.stdout.write("testing client... ")
     sys.stdout.flush()
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py
index 52ede0807f7..436b432a107 100755
--- a/cpp/demo/IceGrid/secure/expect.py
+++ b/cpp/demo/IceGrid/secure/expect.py
@@ -121,7 +121,7 @@ def runtest():
     node.expect("detected termination of.*SimpleServer")
     client.sendline('x')
 
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
 sys.stdout.write("testing client... ")
 sys.stdout.flush()
diff --git a/demoscript/Freeze/phonebook.py b/demoscript/Freeze/phonebook.py
index 843db7dcccb..8b78ac4c352 100755
--- a/demoscript/Freeze/phonebook.py
+++ b/demoscript/Freeze/phonebook.py
@@ -49,7 +49,7 @@ def run(client, server):
             pass
     try:
         while True:
-            client.expect('\n', timeout=1)
+            client.expect('\n', timeout=120)
     except Expect.TIMEOUT:
         pass
     print("ok")
diff --git a/demoscript/Glacier2/callback.py b/demoscript/Glacier2/callback.py
index a74456f879c..716e976fb92 100755
--- a/demoscript/Glacier2/callback.py
+++ b/demoscript/Glacier2/callback.py
@@ -41,7 +41,7 @@ def run(client, server, glacier2):
     client.sendline('O')
     client.sendline('f')
     try:
-        server.expect('initiating callback to', timeout=1)
+        server.expect('initiating callback to', timeout=120)
     except Expect.TIMEOUT:
         pass
     glacier2.expect('_fwd/O')
@@ -63,7 +63,7 @@ def run(client, server, glacier2):
     client.sendline('t')
     server.expect('initiating callback to.*fake.*ObjectNotExistException')
     try:
-        client.expect('received callback', timeout=1)
+        client.expect('received callback', timeout=120)
     except Expect.TIMEOUT:
         pass
     print("ok")
diff --git a/demoscript/Ice/async.py b/demoscript/Ice/async.py
index 72a4f6d7be0..182e5f3fd71 100644
--- a/demoscript/Ice/async.py
+++ b/demoscript/Ice/async.py
@@ -18,7 +18,7 @@ def run(client, server):
     server.expect('Hello World!')
     client.sendline('d')
     try:
-        server.expect('Hello World!', timeout=1)
+        server.expect('Hello World!', timeout=120)
     except Expect.TIMEOUT:
         pass
     client.sendline('i')
diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index 9f562a93c2b..a6d2d6ba9e6 100644
--- a/demoscript/Ice/hello.py
+++ b/demoscript/Ice/hello.py
@@ -31,7 +31,7 @@ def runtests(client, server, secure, datagram):
     sys.stdout.flush()
     client.sendline('O')
     try:
-        server.expect('Hello World!', timeout=1)
+        server.expect('Hello World!', timeout=120)
     except Expect.TIMEOUT:
         pass
     client.sendline('O')
@@ -43,7 +43,7 @@ def runtests(client, server, secure, datagram):
         sys.stdout.flush()
         client.sendline('D')
         try:
-            server.expect('Hello World!', timeout=1)
+            server.expect('Hello World!', timeout=120)
         except Expect.TIMEOUT:
             pass
         client.sendline('D')
diff --git a/demoscript/IceBox/hello.py b/demoscript/IceBox/hello.py
index 6adc15a1bb5..4ab0e478cb8 100755
--- a/demoscript/IceBox/hello.py
+++ b/demoscript/IceBox/hello.py
@@ -31,7 +31,7 @@ def runtests(client, server, secure):
     sys.stdout.flush()
     client.sendline('O')
     try:
-        server.expect('Hello World!', timeout=1)
+        server.expect('Hello World!', timeout=120)
     except Expect.TIMEOUT:
         pass
     client.sendline('O')
@@ -43,7 +43,7 @@ def runtests(client, server, secure):
         sys.stdout.flush()
         client.sendline('D')
         try:
-            server.expect('Hello World!', timeout=1)
+            server.expect('Hello World!', timeout=120)
         except Expect.TIMEOUT:
             pass
         client.sendline('D')
diff --git a/demoscript/IceDiscovery/hello.py b/demoscript/IceDiscovery/hello.py
index 9f562a93c2b..a6d2d6ba9e6 100644
--- a/demoscript/IceDiscovery/hello.py
+++ b/demoscript/IceDiscovery/hello.py
@@ -31,7 +31,7 @@ def runtests(client, server, secure, datagram):
     sys.stdout.flush()
     client.sendline('O')
     try:
-        server.expect('Hello World!', timeout=1)
+        server.expect('Hello World!', timeout=120)
     except Expect.TIMEOUT:
         pass
     client.sendline('O')
@@ -43,7 +43,7 @@ def runtests(client, server, secure, datagram):
         sys.stdout.flush()
         client.sendline('D')
         try:
-            server.expect('Hello World!', timeout=1)
+            server.expect('Hello World!', timeout=120)
         except Expect.TIMEOUT:
             pass
         client.sendline('D')
diff --git a/demoscript/IceGrid/allocate.py b/demoscript/IceGrid/allocate.py
index 9760148d506..71729576981 100755
--- a/demoscript/IceGrid/allocate.py
+++ b/demoscript/IceGrid/allocate.py
@@ -69,7 +69,7 @@ def run(clientCmd):
     node.expect('says Hello World!')
     client2.expect(Expect.TIMEOUT, timeout = 0)
     client1.sendline('x')
-    client1.waitTestSuccess(timeout=1)
+    client1.waitTestSuccess(timeout=120)
 
     client2.expect('==>')
     client2.sendline('t')
@@ -77,7 +77,7 @@ def run(clientCmd):
     client2.sendline('s')
     node.expect('detected termination of server')
     client2.sendline('x')
-    client2.waitTestSuccess(timeout=1)
+    client2.waitTestSuccess(timeout=120)
     print("ok")
 
     sys.stdout.write("deploying multiple... ")
@@ -118,7 +118,7 @@ def run(clientCmd):
     client3.expect(Expect.TIMEOUT, timeout = 0)
 
     client1.sendline('x')
-    client1.waitTestSuccess(timeout=1)
+    client1.waitTestSuccess(timeout=120)
 
     client3.expect('==>')
     client3.sendline('t')
@@ -129,12 +129,12 @@ def run(clientCmd):
     client2.sendline('s')
     node.expect('detected termination of server')
     client2.sendline('x')
-    client2.waitTestSuccess(timeout=1)
+    client2.waitTestSuccess(timeout=120)
 
     client3.sendline('s')
     node.expect('detected termination of server')
     client3.sendline('x')
-    client3.waitTestSuccess(timeout=1)
+    client3.waitTestSuccess(timeout=120)
 
     print("ok")
 
diff --git a/demoscript/IceGrid/icebox.py b/demoscript/IceGrid/icebox.py
index c3e593cbff9..ea0ecc68bac 100755
--- a/demoscript/IceGrid/icebox.py
+++ b/demoscript/IceGrid/icebox.py
@@ -64,7 +64,7 @@ def run(clientStr, desc = 'application'):
     for s in [ "Homer", "Marge", "Bart", "Lisa", "Maggie" ]:
         client = Util.spawn(clientStr)
         node.expect("Hello, %s" % s)
-        client.waitTestSuccess(timeout=1)
+        client.waitTestSuccess(timeout=120)
 
     print("ok")
 
@@ -78,19 +78,19 @@ def run(clientStr, desc = 'application'):
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Homer")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Marge")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Bart")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Homer")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     admin.sendline("service start IceBox Lisa")
     admin.expect('>>>')
@@ -104,19 +104,19 @@ def run(clientStr, desc = 'application'):
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Bart")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Lisa")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Maggie")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Bart")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     print("ok")
 
@@ -145,23 +145,23 @@ def run(clientStr, desc = 'application'):
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Lisa")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Maggie")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Homer")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Marge")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     client = Util.spawn(clientStr)
     node.expect("Hello, Bart")
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
 
     print("ok")
 
diff --git a/demoscript/IceGrid/sessionActivation.py b/demoscript/IceGrid/sessionActivation.py
index f1f23fcf9b9..cee64d6724a 100755
--- a/demoscript/IceGrid/sessionActivation.py
+++ b/demoscript/IceGrid/sessionActivation.py
@@ -59,7 +59,7 @@ def run(clientCmd):
     client.sendline('t')
     node.expect('says Hello World!')
     client.sendline('x')
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
     node.expect('detected termination of server')
 
     client = Util.spawn(clientCmd)
@@ -72,7 +72,7 @@ def run(clientCmd):
     client.sendline('t')
     node.expect('says Hello World!')
     client.sendline('x')
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
     node.expect('detected termination of server')
 
     print("ok")
diff --git a/demoscript/IceGrid/simple.py b/demoscript/IceGrid/simple.py
index 62e19490b0e..40faed71c30 100755
--- a/demoscript/IceGrid/simple.py
+++ b/demoscript/IceGrid/simple.py
@@ -60,7 +60,7 @@ def run(clientStr, desc = 'application'):
     node.expect("detected termination of.*SimpleServer")
     client.sendline('x')
 
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
     print("ok")
 
     sys.stdout.write("deploying template... ")
@@ -81,7 +81,7 @@ def run(clientStr, desc = 'application'):
     node.expect("detected termination of.*SimpleServer-[123]")
     client.sendline('x')
 
-    client.waitTestSuccess(timeout=1)
+    client.waitTestSuccess(timeout=120)
     print("ok")
 
     sys.stdout.write("deploying replicated version... ")
@@ -105,7 +105,7 @@ def run(clientStr, desc = 'application'):
         client.sendline('s')
         node.expect("detected termination of.*SimpleServer-%d" % which)
         client.sendline('x')
-        client.waitTestSuccess(timeout=1)
+        client.waitTestSuccess(timeout=120)
     testserver(1)
     testserver(2)
     testserver(3)