Fixed long waits in multicast.py script and bug in Java udp test where IPv6 wasn't tested for multicast

1 files changed, 15 insertions, 10 deletions

diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py
index e9962e3a5ce..7f90354de27 100644
--- a/demoscript/Ice/multicast.py
+++ b/demoscript/Ice/multicast.py
@@ -15,16 +15,21 @@ from scripts import Expect
 def runClient(clientCmd, server1, server2):
     client = Util.spawn(clientCmd)
     received = False
-    try:
-        server1.expect('Hello World!')
-        received = True
-    except Expect.TIMEOUT:
-        pass
-    try:
-        server2.expect('Hello World!')
-        received = True
-    except Expect.TIMEOUT:
-        pass
+    for i in range(0, 20):
+        try:
+            server1.expect('Hello World!', 1)
+            received = True
+        except Expect.TIMEOUT:
+            pass
+        try:
+            server2.expect('Hello World!', 1)
+            received = True
+        except Expect.TIMEOUT:
+            pass
+
+        if received:
+            break
+
     if not received:
         raise Expect.TIMEOUT
     client.waitTestSuccess()