From b670c900b31d85720ce8d82c4d01003ec09784f6 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 4 Sep 2015 10:17:58 +0100 Subject: Avoid using point-to-point interfaces in multicast socket tests Multicast on a point-to-point interface isn't really multicast. Bug: 23279677 (cherry-picked from commit 67d7597da46910e65a089bcce0afa8e0c2bed668) Change-Id: Ib102e9d04744d3e99b8828ac31d9548e72b703dd --- .../java/org/apache/harmony/tests/java/net/MulticastSocketTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'harmony-tests') diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java index b6a5861..264e004 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java @@ -922,7 +922,10 @@ public class MulticastSocketTest extends junit.framework.TestCase { return iface.isUp() // Typically loopback interfaces do not support multicast, but we rule them out // explicitly anyway. - && !iface.isLoopback() && iface.supportsMulticast() + && !iface.isLoopback() + // Point-to-point interfaces are known to cause problems. http://b/23279677 + && !iface.isPointToPoint() + && iface.supportsMulticast() && iface.getInetAddresses().hasMoreElements(); } -- cgit v1.1