1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8054118: java/net/ipv6tests/UdpTest.java failed intermittently

Browse Source 
Ignore the Teredo interface on windows test machines

Reviewed-by: chegar
This commit is contained in:
Mark Sheppard 2014-08-11 15:34:24 +01:00
parent bbaf4bdb09
commit 1db8e112f7
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/test/java/net/ipv6tests/Tests.java
View File

@ -26,6 +26,9 @@ import java.io.*;
import java.util.*; import java.util.*;
public class Tests { public class Tests {
static boolean isWindows = System.getProperty("os.name").startsWith("Windows");
/** /**
* performs a simple exchange of data between the two sockets * performs a simple exchange of data between the two sockets
* and throws an exception if there is any problem. * and throws an exception if there is any problem.
@ -264,6 +267,12 @@ public class Tests {
if (ifs != null) { if (ifs != null) {
while (ifs.hasMoreElements()) { while (ifs.hasMoreElements()) {
NetworkInterface nic = (NetworkInterface)ifs.nextElement(); NetworkInterface nic = (NetworkInterface)ifs.nextElement();
// Skip (Windows)Teredo Tunneling Pseudo-Interface
if (isWindows) {
String dName = nic.getDisplayName();
if (dName != null && dName.contains("Teredo"))
continue;
}
try { try {
if (nic.isUp() && !nic.isLoopback()) if (nic.isUp() && !nic.isLoopback())
return nic; return nic;