diff options
| author | Neil Fuller <nfuller@google.com> | 2015-09-09 10:13:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-09 10:13:57 +0000 |
| commit | 8add292c990642f7e36c543fb1270d46b844ee27 (patch) | |
| tree | 03297e72990034032b882569fc20dc5cab96e2e4 | |
| parent | 9528400f767569bff62f4ba15060e930bb6fa3ff (diff) | |
| parent | 8967de88f92979dc1faf8870c05c000af40655f9 (diff) | |
| download | libcore-8add292c990642f7e36c543fb1270d46b844ee27.zip libcore-8add292c990642f7e36c543fb1270d46b844ee27.tar.gz libcore-8add292c990642f7e36c543fb1270d46b844ee27.tar.bz2 | |
am 8967de88: am 84887ac9: am a82ee5c3: Avoid using point-to-point interfaces in multicast socket tests
* commit '8967de88f92979dc1faf8870c05c000af40655f9':
Avoid using point-to-point interfaces in multicast socket tests
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java | 5 |
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(); } |