Some more improvements to multicast expect script

1 files changed, 30 insertions, 14 deletions

diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py
index 27dbf60dc08..ce20f77852d 100644
--- a/demoscript/Ice/multicast.py
+++ b/demoscript/Ice/multicast.py
@@ -11,25 +11,41 @@
 import sys, demoscript, signal
 import demoscript.pexpect as pexpect
 
-def runDemo(clientCmd, serverCmd):
-    server = demoscript.Util.spawn(serverCmd + ' --Ice.PrintAdapterReady')
-    server.expect('Discover ready')
-    server.expect('Hello ready')
-
+def runClient(clientCmd, server1, server2):
     client = demoscript.Util.spawn(clientCmd)
-    server.expect('Hello World!')
+    received = False
+    try:
+        server1.expect('Hello World!')
+        received = True
+    except pexpect.TIMEOUT:
+        pass
+    try:
+        server2.expect('Hello World!')
+        received = True
+    except pexpect.TIMEOUT:
+        pass
+    if not received:
+        raise pexpect.TIMEOUT
     client.waitTestSuccess()
 
-    client = demoscript.Util.spawn(clientCmd)
-    server.expect('Hello World!')
-    client.waitTestSuccess()
+def runDemo(clientCmd, serverCmd):
+    server1 = demoscript.Util.spawn(serverCmd + ' --Ice.PrintAdapterReady')
+    server1.expect('Discover ready')
+    server1.expect('Hello ready')
 
-    client = demoscript.Util.spawn(clientCmd)
-    server.expect('Hello World!')
-    client.waitTestSuccess()
+    server2 = demoscript.Util.spawn(serverCmd + ' --Ice.PrintAdapterReady')
+    server2.expect('Discover ready')
+    server2.expect('Hello ready')
+
+    runClient(clientCmd, server1, server2)
+    runClient(clientCmd, server1, server2)
+    runClient(clientCmd, server1, server2)
+
+    server1.kill(signal.SIGINT)
+    server1.waitTestSuccess()
 
-    server.kill(signal.SIGINT)
-    server.waitTestSuccess()
+    server2.kill(signal.SIGINT)
+    server2.waitTestSuccess()
 
 def run(clientCmd, serverCmd):
     print "testing multicast discovery (Ipv4)...",