From d5c3f695f76c8b513be4f3e2b651e8e051693f87 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Wed, 21 Aug 2024 20:40:06 +0800 Subject: [PATCH] macos may have docker0 interface --- test/lib/jdk/test/lib/NetworkConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lib/jdk/test/lib/NetworkConfiguration.java b/test/lib/jdk/test/lib/NetworkConfiguration.java index 2c6539068b25f..3532bb1a3ee20 100644 --- a/test/lib/jdk/test/lib/NetworkConfiguration.java +++ b/test/lib/jdk/test/lib/NetworkConfiguration.java @@ -127,8 +127,8 @@ public static boolean isSameInterface(NetworkInterface ni1, NetworkInterface ni2 public static boolean isTestable(NetworkInterface nif) { if (Platform.isOSX()) { - if (nif.getName().contains("awdl")) { - return false; // exclude awdl + if (nif.getName().contains("awdl") || nif.getName().contains("docker")) { + return false; // exclude awdl or docker } // filter out interfaces that only have link-local IPv6 addresses // on macOS interfaces like 'en6' fall in this category and @@ -146,7 +146,7 @@ public static boolean isTestable(NetworkInterface nif) { } } - if (Platform.isLinux() || Platform.isOSX()) { + if (Platform.isLinux()) { String dName = nif.getDisplayName(); if (dName != null && dName.contains("docker")) { return false;