commit a37fb255a1993e835eea8c934205b1e568a1271c
author Narayan Kamath <narayan@google.com> Wed Aug 14 16:03:05 2013 +0100
committer Brian Carlstrom <bdc@google.com> Thu Aug 15 09:08:17 2013 -0700
tree 82d3f752cada8705bf4048167ebd10105824e2ea
parent ca2c58ceaf2d35d30fe06b1676cc1436a24c4d30

Fix URLConnectionTest#testConnectTimeouts.

Use StuckServer correctly. When StuckServer isn't
in blocking mode, its local socket address isn't 127.0.0.1.

Attempting to connect to localhost will then throw a
SocketException (ECONNREFUSED) instead of a
SocketTimeoutException.

(cherry picked from commit bf1a9e10eefd28bb3a989df20b4a57c745fb3670)

Bug: 10211309
Change-Id: I8aaab598d043b893e73fab9055082fa420cfb9cd

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

diff --git a/luni/src/test/java/libcore/java/net/URLConnectionTest.java b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
index d39e39f..be549ed 100644
--- a/luni/src/test/java/libcore/java/net/URLConnectionTest.java
+++ b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
@@ -1641,9 +1641,12 @@
      * addresses. This is typically one IPv4 address and one IPv6 address.
      */
     public void testConnectTimeouts() throws IOException {
-        StuckServer ss = new StuckServer(false);
+        StuckServer ss = new StuckServer(true);
         int serverPort = ss.getLocalPort();
-        URLConnection urlConnection = new URL("http://localhost:" + serverPort).openConnection();
+        String hostName = ss.getLocalSocketAddress().getAddress().getHostAddress();
+        URLConnection urlConnection = new URL("http://" + hostName + ":" + serverPort + "/")
+                .openConnection();
+
         int timeout = 1000;
         urlConnection.setConnectTimeout(timeout);
         long start = System.currentTimeMillis();