From 03c24ff25bf677051ee4943e3f4dfdbaaf383940 Mon Sep 17 00:00:00 2001
From: Mark Sheppard <msheppar@openjdk.org>
Date: Wed, 27 May 2015 13:04:32 +0100
Subject: [PATCH] 8041677: java/net/MulticastSocket/TestInterfaces failed on
 Oracle VM Virtual Ethernet Adapter

Ignore Teredo interface in test

Reviewed-by: alanb, chegar
---
 jdk/test/java/net/MulticastSocket/TestInterfaces.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jdk/test/java/net/MulticastSocket/TestInterfaces.java b/jdk/test/java/net/MulticastSocket/TestInterfaces.java
index 958e77eb0b4..b9b641d40cc 100644
--- a/jdk/test/java/net/MulticastSocket/TestInterfaces.java
+++ b/jdk/test/java/net/MulticastSocket/TestInterfaces.java
@@ -46,6 +46,11 @@ public class TestInterfaces {
         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 @@ public class TestInterfaces {
                 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)) {