Rollback of commit 7f8e0456efe58711aae98c95c6a9dfb57824b9c2.

*** Reason for rollback ***

Breaks Bazel tests: http://ci.bazel.io/job/bazel-tests/331/#showFailuresLink

*** Original change description ***

Improve reliability/performance of Bazel downloads

1. We now retry on connection failures.
  a. With exponential backoff.
  b. While recovering quickly from ephemeral failures.
  c. While still working if internet or web server is slow.
2. We now request gzip responses from web server.

Fixed #1760
Fixed #1910

RELNOTES: External downloads now retry with exponential backoff and support gzip content-encoding.

--
MOS_MIGRATED_REVID=139899835

10 files changed, 397 insertions, 197 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnection.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnection.java
new file mode 100644
index 0000000000..84e6c47e63
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnection.java
@@ -0,0 +1,238 @@
+// Copyright 2016 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.bazel.repository.downloader;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Optional;
+import com.google.common.io.ByteStreams;
+import com.google.common.net.MediaType;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+/**
+ * Represents a connection over HTTP.
+ */
+class HttpConnection implements Closeable {
+  private static final int MAX_REDIRECTS = 20;
+  private static final int TIMEOUT_MS = 60000;
+  private final InputStream inputStream;
+  private final int contentLength;
+
+  private HttpConnection(InputStream inputStream, int contentLength) {
+    this.inputStream = inputStream;
+    this.contentLength = contentLength;
+  }
+
+  public InputStream getInputStream() {
+    return inputStream;
+  }
+
+  /**
+   * @return The length of the response, or -1 if unknown.
+   */
+  int getContentLength() {
+    return contentLength;
+  }
+
+  @Override
+  public void close() throws IOException {
+    inputStream.close();
+  }
+
+  private static int parseContentLength(HttpURLConnection connection) {
+    String length;
+    try {
+      length = connection.getHeaderField("Content-Length");
+      if (length == null) {
+        return -1;
+      }
+      return Integer.parseInt(length);
+    } catch (NumberFormatException e) {
+      return -1;
+    }
+  }
+
+  /**
+   * Connects to the given URL.  Should not leave any connections open if anything goes wrong.
+   */
+  static HttpConnection createAndConnect(URL url, Map<String, String> clientEnv)
+      throws IOException {
+    Proxy proxy = ProxyHelper.createProxyIfNeeded(url.toString(), clientEnv);
+    for (int i = 0; i < MAX_REDIRECTS; ++i) {
+      URLConnection urlConnection = url.openConnection(proxy);
+      if (!(urlConnection instanceof HttpURLConnection)) {
+        return createFileConnection(urlConnection);
+      }
+
+      HttpURLConnection connection = (HttpURLConnection) urlConnection;
+      int statusCode;
+      try {
+        statusCode = createAndConnectViaHttp(connection);
+      } catch (IOException e) {
+        connection.disconnect();
+        throw e;
+      }
+
+      switch (statusCode) {
+        case HttpURLConnection.HTTP_OK:
+          try {
+            return new HttpConnection(connection.getInputStream(), parseContentLength(connection));
+          } catch (IOException e) {
+            connection.disconnect();
+            throw e;
+          }
+        case HttpURLConnection.HTTP_MOVED_PERM:
+        case HttpURLConnection.HTTP_MOVED_TEMP:
+          // Try again with the new URL. This is the only case that doesn't return/throw.
+          url = tryGetLocation(statusCode, connection);
+          connection.disconnect();
+          break;
+        case -1:
+          throw new IOException("An HTTP error occurred");
+        default:
+          throw new IOException(
+              String.format(
+                  "%s %s: %s",
+                  connection.getResponseCode(),
+                  connection.getResponseMessage(),
+                  readBody(connection)));
+      }
+    }
+    throw new IOException("Maximum redirects (" + MAX_REDIRECTS + ") exceeded");
+  }
+
+  // For file:// URLs.
+  private static HttpConnection createFileConnection(URLConnection connection)
+      throws IOException {
+    int contentLength = connection.getContentLength();
+    // check for empty file. -1 is a valid contentLength, meaning the size of unknown. It's a
+    // common return value for an FTP download request for example. Local files will always
+    // have a valid contentLength value.
+    if (contentLength == 0) {
+      throw new IOException("Attempted to download an empty file");
+    }
+
+    return new HttpConnection(connection.getInputStream(), contentLength);
+  }
+
+  private static int createAndConnectViaHttp(HttpURLConnection connection) throws IOException {
+    connection.setConnectTimeout(TIMEOUT_MS);
+    connection.setReadTimeout(TIMEOUT_MS);
+    try {
+      connection.connect();
+    } catch (SocketTimeoutException e) {
+      throw new IOException(
+          "Timed out connecting to " + connection.getURL() + " : " + e.getMessage(), e);
+    } catch (IllegalArgumentException | IOException e) {
+      throw new IOException(
+          "Failed to connect to " + connection.getURL() + " : " + e.getMessage(), e);
+    }
+    return connection.getResponseCode();
+  }
+
+  private static URL tryGetLocation(int statusCode, HttpURLConnection connection)
+      throws IOException {
+    String newLocation = connection.getHeaderField("Location");
+    if (newLocation == null) {
+      throw new IOException(
+          "Remote returned " + statusCode + " but did not return location header.");
+    }
+
+    URL newUrl;
+    try {
+      newUrl = new URL(newLocation);
+    } catch (MalformedURLException e) {
+      throw new IOException("Remote returned invalid location header: " + newLocation);
+    }
+
+    String newProtocol = newUrl.getProtocol();
+    if (!("http".equals(newProtocol) || "https".equals(newProtocol))) {
+      throw new IOException(
+          "Remote returned invalid location header: " + newLocation);
+    }
+
+    return newUrl;
+  }
+
+  /**
+   * Attempts to detect the encoding the HTTP reponse is using.
+   *
+   * <p>This attempts to read the Content-Encoding header, then the Content-Type header,
+   * then just falls back to UTF-8.</p>
+   *
+   * @throws IOException If something goes wrong (the encoding isn't parsable or is, but isn't
+   * supported by the system).
+   */
+  @VisibleForTesting
+  static Charset getEncoding(HttpURLConnection connection) throws IOException {
+    String encoding = connection.getContentEncoding();
+    if (encoding != null) {
+      if (Charset.availableCharsets().containsKey(encoding)) {
+        try {
+          return Charset.forName(encoding);
+        } catch (IllegalArgumentException | UnsupportedOperationException e) {
+          throw new IOException(
+              "Got invalid encoding from " + connection.getURL() + ": " + encoding);
+        }
+      } else {
+        throw new IOException(
+            "Got unavailable encoding from " + connection.getURL() + ": " + encoding);
+      }
+    }
+    encoding = connection.getContentType();
+    if (encoding == null) {
+      return StandardCharsets.UTF_8;
+    }
+    try {
+      MediaType mediaType = MediaType.parse(encoding);
+      if (mediaType == null) {
+        return StandardCharsets.UTF_8;
+      }
+      Optional<Charset> charset = mediaType.charset();
+      if (charset.isPresent()) {
+        return charset.get();
+      }
+    } catch (IllegalArgumentException | IllegalStateException e) {
+      throw new IOException(
+          "Got invalid encoding from " + connection.getURL() + ": " + encoding);
+    }
+    return StandardCharsets.UTF_8;
+  }
+
+  private static String readBody(HttpURLConnection connection) throws IOException {
+    InputStream errorStream = connection.getErrorStream();
+    Charset encoding = getEncoding(connection);
+    if (errorStream != null) {
+      return new String(ByteStreams.toByteArray(errorStream), encoding);
+    }
+
+    InputStream responseStream = connection.getInputStream();
+    if (responseStream != null) {
+      return new String(ByteStreams.toByteArray(responseStream), encoding);
+    }
+
+    return null;
+  }
+}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpDownloader.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpDownloader.java
index ea4cc81d7c..400f9e2d02 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpDownloader.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpDownloader.java
@@ -31,7 +31,6 @@ import com.google.devtools.build.skyframe.SkyFunctionException.Transience;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.Proxy;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -83,7 +82,10 @@ public class HttpDownloader {
     try {
       return download(url, sha256, type, outputDirectory, eventHandler, clientEnv);
     } catch (IOException e) {
-      throw new RepositoryFunctionException(e, SkyFunctionException.Transience.TRANSIENT);
+      throw new RepositoryFunctionException(
+          new IOException(
+              "Error downloading from " + url + " to " + outputDirectory + ": " + e.getMessage()),
+          SkyFunctionException.Transience.TRANSIENT);
     }
   }
 
@@ -128,10 +130,10 @@ public class HttpDownloader {
     AtomicInteger totalBytes = new AtomicInteger(0);
     final ScheduledFuture<?> loggerHandle = getLoggerHandle(totalBytes, eventHandler, urlString);
     final URL url = new URL(urlString);
-    Proxy proxy = ProxyHelper.createProxyIfNeeded(url.toString(), clientEnv);
 
     try (OutputStream out = destination.getOutputStream();
-         InputStream inputStream = HttpConnector.connect(url, proxy, eventHandler)) {
+         HttpConnection connection = HttpConnection.createAndConnect(url, clientEnv)) {
+      InputStream inputStream = connection.getInputStream();
       int read;
       byte[] buf = new byte[BUFFER_SIZE];
       while ((read = inputStream.read(buf)) > 0) {
@@ -141,6 +143,11 @@ public class HttpDownloader {
           throw new InterruptedException("Download interrupted");
         }
       }
+      if (connection.getContentLength() != -1
+          && totalBytes.get() != connection.getContentLength()) {
+        throw new IOException("Expected " + formatSize(connection.getContentLength()) + ", got "
+            + formatSize(totalBytes.get()));
+      }
     } catch (IOException e) {
       throw new IOException(
           "Error downloading " + url + " to " + destination + ": " + e.getMessage());
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java
index 37093d47a7..bc5a9cdf20 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java
@@ -38,9 +38,8 @@ public class HttpArchiveRule implements RuleDefinition {
         /* <!-- #BLAZE_RULE(http_archive).ATTRIBUTE(url) -->
          A URL referencing an archive file containing a Bazel repository.
 
-         <p>This must be a file, http, or https URL. Archives of the following types are allowed:
-         `"zip"`, `"jar"`, `"war"`, `"tar.gz"`, `"tgz"`, `"tar.xz"`, and `tar.bz2`. Redirects
-         are followed. There is no support for authentication.</p>
+         <p>Archives of type .zip, .jar, .war, .tar.gz or .tgz are supported. There is no support
+         for authentication. Redirections are followed, but not from HTTP to HTTPS.</p>
          <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr("url", STRING).mandatory())
         /* <!-- #BLAZE_RULE(http_archive).ATTRIBUTE(sha256) -->
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java
index 2cda4946a5..97a8dc3ac5 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java
@@ -39,8 +39,8 @@ public class HttpFileRule implements RuleDefinition {
         /* <!-- #BLAZE_RULE(http_file).ATTRIBUTE(url) -->
          A URL to a file that will be made available to Bazel.
 
-         <p>This must be a file, http or https URL. Redirects are followed. Authentication is not
-         supported.</p>
+         <p>This must be an http or https URL. Authentication is not support.
+         Redirections are followed, but not from HTTP to HTTPS.</p>
          <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr("url", STRING).mandatory())
         /* <!-- #BLAZE_RULE(http_file).ATTRIBUTE(sha256) -->
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java
index 86cd1523a6..82a49ef583 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java
@@ -38,8 +38,8 @@ public class HttpJarRule implements RuleDefinition {
         /* <!-- #BLAZE_RULE(http_jar).ATTRIBUTE(url) -->
         A URL to an archive file containing a Bazel repository.
 
-        <p>This must be a file, http or https URL that ends with .jar. Redirections are
-        followed. There is no support for authentication.</p>
+        <p>This must be an http or https URL that ends with .jar. Redirections are followed, but
+        not from HTTP to HTTPS.</p>
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr("url", STRING).mandatory())
         /* <!-- #BLAZE_RULE(http_jar).ATTRIBUTE(sha256) -->
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewHttpArchiveRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewHttpArchiveRule.java
index 45c34dd557..70ddb28e21 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewHttpArchiveRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewHttpArchiveRule.java
@@ -35,9 +35,8 @@ public class NewHttpArchiveRule implements RuleDefinition {
         /* <!-- #BLAZE_RULE(new_http_archive).ATTRIBUTE(url) -->
          A URL referencing an archive file containing a Bazel repository.
 
-         <p>This must be a file, http, or https URL. Archives of the following types are allowed:
-         `"zip"`, `"jar"`, `"war"`, `"tar.gz"`, `"tgz"`, `"tar.xz"`, and `tar.bz2`. Redirects
-         are followed. There is no support for authentication.</p>
+         <p>Archives of type .zip, .jar, .war, .tar.gz or .tgz are supported. There is no support
+         for authentication. Redirections are followed, but not from HTTP to HTTPS.</p>
          <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr("url", STRING).mandatory())
         /* <!-- #BLAZE_RULE(new_http_archive).ATTRIBUTE(sha256) -->
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD
index 988efb8132..f29ceb4e7a 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD
@@ -5,11 +5,11 @@ filegroup(
 )
 
 java_test(
-    name = "DownloaderTestSuite",
+    name = "DownloaderTests",
     srcs = glob(["*.java"]),
     tags = ["rules"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
-        "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader",
         "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
         "//src/test/java/com/google/devtools/build/lib:test_runner",
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/DownloaderTestSuite.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/DownloaderTestSuite.java
deleted file mode 100644
index 1a48a1ceb5..0000000000
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/DownloaderTestSuite.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.bazel.repository.downloader;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-/** Test suite for downloader package. */
-@RunWith(Suite.class)
-@SuiteClasses({
-  HttpConnectorTest.class,
-  ProxyHelperTest.class,
-})
-class DownloaderTestSuite {}
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnectionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnectionTest.java
new file mode 100644
index 0000000000..93d9f61ddd
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnectionTest.java
@@ -0,0 +1,138 @@
+// Copyright 2016 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.bazel.repository.downloader;
+
+import static com.google.common.truth.Truth.assertThat;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.when;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.ByteStreams;
+import com.google.common.net.MediaType;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.nio.charset.Charset;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mockito;
+
+/**
+ * Tests for @{link HttpConnection}.
+ */
+@RunWith(JUnit4.class)
+public class HttpConnectionTest {
+
+  @Test
+  public void testEncodingSet() throws Exception {
+    Map<String, Charset> charsets = Charset.availableCharsets();
+    assertThat(charsets).isNotEmpty();
+    Map.Entry<String, Charset> entry = charsets.entrySet().iterator().next();
+
+    String availableEncoding = entry.getKey();
+    Charset availableCharset = entry.getValue();
+
+    HttpURLConnection connection = Mockito.mock(HttpURLConnection.class);
+    when(connection.getContentEncoding()).thenReturn(availableEncoding);
+    Charset charset = HttpConnection.getEncoding(connection);
+    assertEquals(availableCharset, charset);
+  }
+
+  @Test
+  public void testInvalidEncoding() throws Exception {
+    HttpURLConnection connection = Mockito.mock(HttpURLConnection.class);
+    when(connection.getContentEncoding()).thenReturn("This-isn't-a-valid-content-encoding");
+    try {
+      HttpConnection.getEncoding(connection);
+      fail("Expected exception");
+    } catch (IOException e) {
+      assertThat(e.getMessage()).contains("Got unavailable encoding");
+    }
+  }
+
+  @Test
+  public void testContentType() throws Exception {
+    HttpURLConnection connection = Mockito.mock(HttpURLConnection.class);
+    when(connection.getContentType()).thenReturn(MediaType.HTML_UTF_8.toString());
+    Charset charset = HttpConnection.getEncoding(connection);
+    assertEquals(UTF_8, charset);
+  }
+
+  @Test
+  public void testInvalidContentType() throws Exception {
+    HttpURLConnection connection = Mockito.mock(HttpURLConnection.class);
+    when(connection.getContentType()).thenReturn("This-isn't-a-valid-content-type");
+    try {
+      HttpConnection.getEncoding(connection);
+      fail("Expected exception");
+    } catch (IOException e) {
+      assertThat(e.getMessage()).contains("Got invalid encoding");
+    }
+  }
+
+  @Test
+  public void testNoEncodingNorContentType() throws Exception {
+    HttpURLConnection connection = Mockito.mock(HttpURLConnection.class);
+    Charset charset = HttpConnection.getEncoding(connection);
+    assertEquals(UTF_8, charset);
+  }
+
+  /**
+   * Creates a temporary file with the specified {@code fileContents}. The file will be
+   * automatically deleted when the JVM exits.
+   *
+   * @param fileContents the contents of the file
+   * @return the {@link File} object representing the temporary file
+   */
+  private static File createTempFile(byte[] fileContents) throws IOException {
+    File temp = File.createTempFile("httpConnectionTest", ".tmp");
+    temp.deleteOnExit();
+    try (FileOutputStream outputStream = new FileOutputStream(temp)) {
+      outputStream.write(fileContents);
+    }
+    return temp;
+  }
+
+  @Test
+  public void testLocalFileDownload() throws Exception {
+    byte[] fileContents = "this is a test".getBytes(UTF_8);
+    File temp = createTempFile(fileContents);
+    HttpConnection httpConnection =
+        HttpConnection.createAndConnect(temp.toURI().toURL(), ImmutableMap.<String, String>of());
+
+    assertThat(httpConnection.getContentLength()).isEqualTo(fileContents.length);
+
+    byte[] readContents = ByteStreams.toByteArray(httpConnection.getInputStream());
+    assertThat(readContents).isEqualTo(fileContents);
+  }
+
+  @Test
+  public void testLocalEmptyFileDownload() throws Exception {
+    byte[] fileContents = new byte[0];
+    // create a temp file
+    File temp = createTempFile(fileContents);
+    try {
+      HttpConnection.createAndConnect(temp.toURI().toURL(), ImmutableMap.<String, String>of());
+      fail("Expected exception");
+    } catch (IOException ex) {
+      // expected
+    }
+  }
+}
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnectorTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnectorTest.java
deleted file mode 100644
index eae5ad96e1..0000000000
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/HttpConnectorTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2016 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.bazel.repository.downloader;
-
-import static com.google.common.truth.Truth.assertThat;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.google.common.io.ByteStreams;
-import com.google.devtools.build.lib.events.EventHandler;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.Proxy;
-import java.net.URL;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Unit tests for {@link HttpConnector}.
- */
-@RunWith(JUnit4.class)
-public class HttpConnectorTest {
-
-  @Rule
-  public final ExpectedException thrown = ExpectedException.none();
-
-  @Rule
-  public TemporaryFolder testFolder = new TemporaryFolder();
-
-  private final HttpURLConnection connection = mock(HttpURLConnection.class);
-  private final EventHandler eventHandler = mock(EventHandler.class);
-
-  @Test
-  public void testLocalFileDownload() throws Exception {
-    byte[] fileContents = "this is a test".getBytes(UTF_8);
-    assertThat(
-            ByteStreams.toByteArray(
-                HttpConnector.connect(
-                    createTempFile(fileContents).toURI().toURL(),
-                    Proxy.NO_PROXY,
-                    eventHandler)))
-        .isEqualTo(fileContents);
-  }
-
-  @Test
-  public void missingLocationInRedirect_throwsIOException() throws Exception {
-    thrown.expect(IOException.class);
-    when(connection.getURL()).thenReturn(new URL("http://lol.example"));
-    HttpConnector.getLocation(connection);
-  }
-
-  @Test
-  public void absoluteLocationInRedirect_returnsNewUrl() throws Exception {
-    when(connection.getURL()).thenReturn(new URL("http://lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("http://new.example/hi");
-    assertThat(HttpConnector.getLocation(connection)).isEqualTo(new URL("http://new.example/hi"));
-  }
-
-  @Test
-  public void redirectOnlyHasPath_mergesHostFromOriginalUrl() throws Exception {
-    when(connection.getURL()).thenReturn(new URL("http://lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("/hi");
-    assertThat(HttpConnector.getLocation(connection)).isEqualTo(new URL("http://lol.example/hi"));
-  }
-
-  @Test
-  public void locationOnlyHasPathWithoutSlash_failsToMerge() throws Exception {
-    thrown.expect(IOException.class);
-    thrown.expectMessage("Could not merge");
-    when(connection.getURL()).thenReturn(new URL("http://lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("omg");
-    HttpConnector.getLocation(connection);
-  }
-
-  @Test
-  public void locationHasFragment_prefersNewFragment() throws Exception {
-    when(connection.getURL()).thenReturn(new URL("http://lol.example#a"));
-    when(connection.getHeaderField("Location")).thenReturn("http://new.example/hi#b");
-    assertThat(HttpConnector.getLocation(connection)).isEqualTo(new URL("http://new.example/hi#b"));
-  }
-
-  @Test
-  public void locationHasNoFragmentButOriginalDoes_mergesOldFragment() throws Exception {
-    when(connection.getURL()).thenReturn(new URL("http://lol.example#a"));
-    when(connection.getHeaderField("Location")).thenReturn("http://new.example/hi");
-    assertThat(HttpConnector.getLocation(connection)).isEqualTo(new URL("http://new.example/hi#a"));
-  }
-
-  @Test
-  public void oldUrlHasPasswordRedirectingToSameDomain_mergesPassword() throws Exception {
-    when(connection.getURL()).thenReturn(new URL("http://a:b@lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("http://lol.example/hi");
-    assertThat(HttpConnector.getLocation(connection))
-        .isEqualTo(new URL("http://a:b@lol.example/hi"));
-    when(connection.getURL()).thenReturn(new URL("http://a:b@lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("/hi");
-    assertThat(HttpConnector.getLocation(connection))
-        .isEqualTo(new URL("http://a:b@lol.example/hi"));
-  }
-
-  @Test
-  public void oldUrlHasPasswordRedirectingToNewServer_doesntMergePassword() throws Exception {
-    when(connection.getURL()).thenReturn(new URL("http://a:b@lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("http://new.example/hi");
-    assertThat(HttpConnector.getLocation(connection)).isEqualTo(new URL("http://new.example/hi"));
-    when(connection.getURL()).thenReturn(new URL("http://a:b@lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("http://lol.example:81/hi");
-    assertThat(HttpConnector.getLocation(connection))
-        .isEqualTo(new URL("http://lol.example:81/hi"));
-  }
-
-  @Test
-  public void redirectToFtp_throwsIOException() throws Exception {
-    thrown.expect(IOException.class);
-    thrown.expectMessage("Bad Location");
-    when(connection.getURL()).thenReturn(new URL("http://lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("ftp://lol.example");
-    HttpConnector.getLocation(connection);
-  }
-
-  @Test
-  public void redirectToHttps_works() throws Exception {
-    when(connection.getURL()).thenReturn(new URL("http://lol.example"));
-    when(connection.getHeaderField("Location")).thenReturn("https://lol.example");
-    assertThat(HttpConnector.getLocation(connection)).isEqualTo(new URL("https://lol.example"));
-  }
-
-  private File createTempFile(byte[] fileContents) throws IOException {
-    File temp = testFolder.newFile();
-    try (FileOutputStream outputStream = new FileOutputStream(temp)) {
-      outputStream.write(fileContents);
-    }
-    return temp;
-  }
-}