commit 7c265806fdbd12b1d46fd6940dd0196c216499d4
author Pete Bentley <prb@google.com> Fri Apr 05 13:21:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 05 13:21:09 2019 +0000
tree 92337cbe81b6ae872511f65ef9635a92949c5383
parent 64c393fe3039254443fa215251449a68b08ad5a0
parent 6baceead219d1fc1807b980a5c09398834df5315

Merge "Clarify InetAddressTest failure message."

luni/src/test/java/libcore/java/net/InetAddressTest.java

diff --git a/luni/src/test/java/libcore/java/net/InetAddressTest.java b/luni/src/test/java/libcore/java/net/InetAddressTest.java
index 307cd1d..2ce79fd 100644
--- a/luni/src/test/java/libcore/java/net/InetAddressTest.java
+++ b/luni/src/test/java/libcore/java/net/InetAddressTest.java
@@ -36,6 +36,7 @@
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 import libcore.libcore.util.SerializationTester;
+import libcore.net.InetAddressUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -312,8 +313,11 @@
     public void test_getByName_invalid(String invalid) throws Exception {
         try {
             InetAddress.getByName(invalid);
-            fail("Invalid IP address incorrectly recognized as valid: "
-                + invalid);
+            String failMessage = "Invalid IP address incorrectly recognized as valid: " + invalid;
+            if (InetAddressUtils.parseNumericAddressNoThrowStripOptionalBrackets(invalid) == null) {
+                failMessage += " (it was probably unexpectedly resolved by this network's DNS)";
+            }
+            fail(failMessage);
         } catch (UnknownHostException expected) {
         }