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

3 files changed, 17 insertions, 12 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()
diff --git a/java/test/Ice/udp/AllTests.java b/java/test/Ice/udp/AllTests.java
index 58788faba70..94e600df24c 100644
--- a/java/test/Ice/udp/AllTests.java
+++ b/java/test/Ice/udp/AllTests.java
@@ -145,7 +145,7 @@ public class AllTests
         System.out.print("testing udp multicast... ");
         System.out.flush();
         String host;
-        if(communicator.getProperties().getProperty("Ice.IPv6") == "1")
+        if(communicator.getProperties().getProperty("Ice.IPv6").equals("1"))
         {
             host = "\"ff01::1:1\"";
         }
diff --git a/java/test/Ice/udp/Server.java b/java/test/Ice/udp/Server.java
index 6fb99ce4636..c25d0f7f428 100644
--- a/java/test/Ice/udp/Server.java
+++ b/java/test/Ice/udp/Server.java
@@ -53,7 +53,7 @@ public class Server extends test.Util.Application
         initData.properties.setProperty("Ice.UDP.SndSize", "16384");
 
         String host;
-        if(initData.properties.getProperty("Ice.IPv6") == "1")
+        if(initData.properties.getProperty("Ice.IPv6").equals("1"))
         {
             host = "\"ff01::1:1\"";
         }