summaryrefslogtreecommitdiff
path: root/demoscript/Ice
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2009-01-09 12:57:39 -0800
committerMark Spruiell <mes@zeroc.com>2009-01-09 12:57:39 -0800
commitcc71bb128d601e0e90e5a4901f3fe8a126f3b9ff (patch)
treee29e673bc4b29f078d81a9472212ae1b1835f2e9 /demoscript/Ice
parentFix 3638 - IcePHP not compile because SignalHandler is missing. (diff)
downloadice-cc71bb128d601e0e90e5a4901f3fe8a126f3b9ff.tar.bz2
ice-cc71bb128d601e0e90e5a4901f3fe8a126f3b9ff.tar.xz
ice-cc71bb128d601e0e90e5a4901f3fe8a126f3b9ff.zip
bug 2425 - fix expect scripts for hello demo
Diffstat (limited to 'demoscript/Ice')
-rw-r--r--demoscript/Ice/hello.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index 75791ef7674..a003b0c9598 100644
--- a/demoscript/Ice/hello.py
+++ b/demoscript/Ice/hello.py
@@ -59,13 +59,7 @@ def runtests(client, server, secure):
client.sendline('P')
client.expect('server delay is now set to 2500ms')
client.sendline('t')
- # With Java/C# under Windows the tcp connection shutdown takes
- # longer than expected... hence we use a 6 second timeout instead
- # of the expected ~4s.
- #
- # http://bugzilla/bugzilla/show_bug.cgi?id=2425
- #
- client.expect('.*TimeoutException.*', timeout=6)
+ client.expect('.*TimeoutException.*', timeout=5)
server.expect('Hello World!')
server.expect('Hello World!') # second because op is idempotent
client.sendline('P')