From c85b4d4a8039d6cfc020b765bf1ffd8d35c51ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andre=CC=81n?= Date: Tue, 8 Dec 2015 16:42:16 +0100 Subject: [PATCH] =doc #16262 do not bind udp test to docker interfaces --- .../rst/java/code/docs/io/JavaUdpMulticastTest.java | 4 +++- .../scala/code/docs/io/ScalaUdpMulticastSpec.scala | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/akka-docs/rst/java/code/docs/io/JavaUdpMulticastTest.java b/akka-docs/rst/java/code/docs/io/JavaUdpMulticastTest.java index 666735f4c9..151d2a494a 100644 --- a/akka-docs/rst/java/code/docs/io/JavaUdpMulticastTest.java +++ b/akka-docs/rst/java/code/docs/io/JavaUdpMulticastTest.java @@ -35,7 +35,9 @@ public class JavaUdpMulticastTest { for (Enumeration 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 addresses = interf.getInetAddresses(); addresses.hasMoreElements() && ipv6Iface == null; ) { InetAddress address = addresses.nextElement(); if (address instanceof Inet6Address) { diff --git a/akka-docs/rst/scala/code/docs/io/ScalaUdpMulticastSpec.scala b/akka-docs/rst/scala/code/docs/io/ScalaUdpMulticastSpec.scala index d7ab59121c..3b72555169 100644 --- a/akka-docs/rst/scala/code/docs/io/ScalaUdpMulticastSpec.scala +++ b/akka-docs/rst/scala/code/docs/io/ScalaUdpMulticastSpec.scala @@ -19,10 +19,15 @@ class ScalaUdpMulticastSpec extends TestKit(ActorSystem("ScalaUdpMulticastSpec") "listener" should { "send message back to sink" in { - val Some(ipv6Iface) = NetworkInterface.getNetworkInterfaces.collectFirst { - // awdl0 is a special interface on OSX that we cannot use - case iface if iface.getInetAddresses.exists(_.isInstanceOf[Inet6Address]) && iface.getDisplayName != "awdl0" => iface + + def okInterfaceToUse(iface: NetworkInterface): Boolean = { + iface.getInetAddresses.exists(_.isInstanceOf[Inet6Address]) && + // awdl0 is a special interface on OSX that we cannot use + iface.getDisplayName != "awdl0" && + // we do not want to use virtual docker interfaces + !iface.getDisplayName.contains("docker") } + val Some(ipv6Iface) = NetworkInterface.getNetworkInterfaces.find(okInterfaceToUse) // host assigned link local multicast address http://tools.ietf.org/html/rfc3307#section-4.3.2 // generate a random 32 bit multicast address with the high order bit set