summaryrefslogtreecommitdiff
path: root/demoscript/Ice
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2010-02-09 04:46:53 +0100
committerJose <jose@zeroc.com>2010-02-09 04:46:53 +0100
commit90f19293df2848fb5d2a286ff12497b403fc378f (patch)
tree30690c44404ef05875948c8296668ee99bbf1784 /demoscript/Ice
parentBug 4660 - Ice VC6 dlls not signed (diff)
downloadice-90f19293df2848fb5d2a286ff12497b403fc378f.tar.bz2
ice-90f19293df2848fb5d2a286ff12497b403fc378f.tar.xz
ice-90f19293df2848fb5d2a286ff12497b403fc378f.zip
4626 - multicast expect.py fails on CentOS
Diffstat (limited to 'demoscript/Ice')
-rw-r--r--demoscript/Ice/multicast.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py
index 20993841018..16688c10f82 100644
--- a/demoscript/Ice/multicast.py
+++ b/demoscript/Ice/multicast.py
@@ -15,6 +15,7 @@ from scripts import Expect
def runClient(clientCmd, server1, server2):
client = Util.spawn(clientCmd)
received = False
+ ex = None
for i in range(0, 20):
try:
server1.expect('Hello World!', 1)
@@ -24,14 +25,15 @@ def runClient(clientCmd, server1, server2):
try:
server2.expect('Hello World!', 1)
received = True
- except Expect.TIMEOUT:
+ except Expect.TIMEOUT, e:
+ ex = e
pass
if received:
break
if not received:
- raise Expect.TIMEOUT
+ raise ex
client.waitTestSuccess()
def runDemo(clientCmd, serverCmd):