changeset 30809:2c40760f65a9

8041677: java/net/MulticastSocket/TestInterfaces failed on Oracle VM Virtual Ethernet Adapter Summary: ignore Teredo interface in test Reviewed-by: alanb, chegar
author msheppar
date Wed, 27 May 2015 13:04:32 +0100
parents 6257b2441b5f
children cbb29036f026
files jdk/test/java/net/MulticastSocket/TestInterfaces.java
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/test/java/net/MulticastSocket/TestInterfaces.java	Tue May 26 12:34:51 2015 -0700
+++ b/jdk/test/java/net/MulticastSocket/TestInterfaces.java	Wed May 27 13:04:32 2015 +0100
@@ -46,6 +46,11 @@
         while (nifs.hasMoreElements()) {
             NetworkInterface ni = (NetworkInterface)nifs.nextElement();
 
+            // JDK-8022963, Skip (Windows) Teredo Tunneling Pseudo-Interface
+            String dName = ni.getDisplayName();
+            if (isWindows && dName != null && dName.contains("Teredo"))
+                continue;
+
             /*
              * Test MulticastSocket.getInterface
              */
@@ -92,10 +97,6 @@
                 continue;
             }
 
-            // JDK-8022963, Skip (Windows) Teredo Tunneling Pseudo-Interface
-            String dName = ni.getDisplayName();
-            if (isWindows && dName != null && dName.contains("Teredo"))
-                continue;
 
             NetworkInterface curr = soc.getNetworkInterface();
             if (!curr.equals(ni)) {