Restore some timeout erroneously changed

6 files changed, 10 insertions, 10 deletions

diff --git a/demoscript/Freeze/phonebook.py b/demoscript/Freeze/phonebook.py
index 8b78ac4c352..843db7dcccb 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=120)
+            client.expect('\n', timeout=1)
     except Expect.TIMEOUT:
         pass
     print("ok")
diff --git a/demoscript/Glacier2/callback.py b/demoscript/Glacier2/callback.py
index 716e976fb92..a74456f879c 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=120)
+        server.expect('initiating callback to', timeout=1)
     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=120)
+        client.expect('received callback', timeout=1)
     except Expect.TIMEOUT:
         pass
     print("ok")
diff --git a/demoscript/Ice/async.py b/demoscript/Ice/async.py
index 182e5f3fd71..72a4f6d7be0 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=120)
+        server.expect('Hello World!', timeout=1)
     except Expect.TIMEOUT:
         pass
     client.sendline('i')
diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index a6d2d6ba9e6..9f562a93c2b 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=120)
+        server.expect('Hello World!', timeout=1)
     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=120)
+            server.expect('Hello World!', timeout=1)
         except Expect.TIMEOUT:
             pass
         client.sendline('D')
diff --git a/demoscript/IceBox/hello.py b/demoscript/IceBox/hello.py
index 4ab0e478cb8..6adc15a1bb5 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=120)
+        server.expect('Hello World!', timeout=1)
     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=120)
+            server.expect('Hello World!', timeout=1)
         except Expect.TIMEOUT:
             pass
         client.sendline('D')
diff --git a/demoscript/IceDiscovery/hello.py b/demoscript/IceDiscovery/hello.py
index a6d2d6ba9e6..9f562a93c2b 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=120)
+        server.expect('Hello World!', timeout=1)
     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=120)
+            server.expect('Hello World!', timeout=1)
         except Expect.TIMEOUT:
             pass
         client.sendline('D')