DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffers
This is upstream okhttp commit 8b19bc471f66ee45c5eed3df6817411d074aabe5.
https://github.com/square/okhttp/commit/8b19bc471f66ee45c5eed3df6817411d074aabe5
back-ported to Android's version of OkHttp.
From the upstream commit:
The test relies on small client send / server receive buffers
to force blocking and generate a timeout.
The switch to make MockWebServer a @Rule (commit
785d9e94387f404f571775a49c3a9438508bb659) moved the
MockWebServer.start() call earlier in the test execution.
Setting the ServerSocketFactory became a no-op so the server
receive buffer size was left as the default.
The test became reliant on either:
1) The default server socket receive buffer being small enough
(e.g. less than the data being transmitted).
2) The device being too slow to send the requested data in the
time allowed.
The test was recently made less reliable by:
1) The okio commit
f30955cb15eb234f874dd55819686832c960765b, which made the segment
size bigger (increasing throughput / transfer efficiency).
2) The OkHttp commit f30955cb15eb234f874dd55819686832c960765b,
which reduced the amount of data being sent in the test from
16MB to 2MB.
3) Recent Android devices have large default buffer sizes. e.g.
Nexus 5: 1MB, Nexus 5X: 6MB.
Bug: 25459708
Change-Id: Icaa3255d86d228302931baca0432ea9a5be1e7f0
diff --git a/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java b/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
index 259cf3e..27e58ba 100644
--- a/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
+++ b/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
@@ -126,6 +126,8 @@
public void setServerSocketFactory(ServerSocketFactory serverSocketFactory) {
if (serverSocketFactory == null) throw new IllegalArgumentException("null serverSocketFactory");
+ if (executor != null) throw new IllegalStateException(
+ "setServerSocketFactory() must be called before start()");
this.serverSocketFactory = serverSocketFactory;
}
diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
index f541c31..2ad5466 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
@@ -2220,10 +2220,11 @@
/** Confirm that an unacknowledged write times out. */
@Test public void writeTimeouts() throws IOException {
+ MockWebServer server = new MockWebServer();
// Sockets on some platforms can have large buffers that mean writes do not block when
// required. These socket factories explicitly set the buffer sizes on sockets created.
final int SOCKET_BUFFER_SIZE = 4 * 1024;
- server.get().setServerSocketFactory(
+ server.setServerSocketFactory(
new DelegatingServerSocketFactory(ServerSocketFactory.getDefault()) {
@Override
protected void configureServerSocket(ServerSocket serverSocket) throws IOException {
@@ -2238,6 +2239,7 @@
}
});
+ server.start();
server.enqueue(new MockResponse()
.throttleBody(1, 1, TimeUnit.SECONDS)); // Prevent the server from reading!
