Merge pull request #19126 from akka/wip-16262-fix-flakey-udp-test-johanandren

=doc #16262 do not bind udp test to docker interfaces
This commit is contained in:
Konrad Malawski 2015-12-08 17:21:53 +01:00
commit 98ab4eb653
2 changed files with 11 additions and 4 deletions

View file

@ -35,7 +35,9 @@ public class JavaUdpMulticastTest {
for (Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements() && ipv6Iface == null;) {
NetworkInterface interf = interfaces.nextElement();
// awdl0 is a special interface on OSX that we cannot use
if (!interf.getDisplayName().equals("awdl0")) {
if (!interf.getDisplayName().equals("awdl0") &&
// we do not want to use virtual docker interfaces
!interf.getDisplayName().contains("docker")) {
for (Enumeration<InetAddress> addresses = interf.getInetAddresses(); addresses.hasMoreElements() && ipv6Iface == null; ) {
InetAddress address = addresses.nextElement();
if (address instanceof Inet6Address) {