summaryrefslogtreecommitdiffstats
path: root/harmony-tests
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-09-04 10:17:58 +0100
committerThe Android Automerger <android-build@google.com>2015-09-10 17:02:40 -0700
commitb670c900b31d85720ce8d82c4d01003ec09784f6 (patch)
tree03297e72990034032b882569fc20dc5cab96e2e4 /harmony-tests
parent8cc9edc542ef321e179ae58445e05034c391bc82 (diff)
downloadlibcore-b670c900b31d85720ce8d82c4d01003ec09784f6.zip
libcore-b670c900b31d85720ce8d82c4d01003ec09784f6.tar.gz
libcore-b670c900b31d85720ce8d82c4d01003ec09784f6.tar.bz2
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
Diffstat (limited to 'harmony-tests')
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java5
1 files changed, 4 insertions, 1 deletions
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();
}