Skip to content

Commit ec72d3d

Browse files
authored
Close MockWebServer connections on failure (#9875)
* Add bad tests demonstrating the MockWebServer issue * Close MockWebServer connections on failure * Move tests to non-deprecated project
1 parent c37fa7d commit ec72d3d

2 files changed

Lines changed: 33 additions & 0 deletions

File tree

‎mockwebserver/src/main/kotlin/mockwebserver3/MockWebServer.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,13 @@ public class MockWebServer : Closeable {
427427
SocketHandler(connectionIndex, raw, firstExchangePeek).handle()
428428
} catch (e: IOException) {
429429
logger.fine("$this connection from ${raw.inetAddress} failed: $e")
430+
raw.closeQuietly()
430431
} catch (e: Exception) {
431432
logger.log(Level.SEVERE, "$this connection from ${raw.inetAddress} crashed", e)
433+
raw.closeQuietly()
434+
} catch (e: Error) {
435+
raw.closeQuietly()
436+
throw e
432437
}
433438
}
434439
}

‎mockwebserver/src/test/java/mockwebserver3/MockWebServerTest.kt‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package mockwebserver3
1717

18+
import assertk.assertFailure
1819
import assertk.assertThat
1920
import assertk.assertions.contains
2021
import assertk.assertions.containsExactly
@@ -24,6 +25,7 @@ import assertk.assertions.isEqualTo
2425
import assertk.assertions.isGreaterThan
2526
import assertk.assertions.isGreaterThanOrEqualTo
2627
import assertk.assertions.isNotEqualTo
28+
import assertk.assertions.isNotInstanceOf
2729
import assertk.assertions.isNotNull
2830
import assertk.assertions.isNull
2931
import java.io.BufferedReader
@@ -931,4 +933,30 @@ class MockWebServerTest {
931933
val recordedRequest = server.takeRequest()
932934
assertThat(recordedRequest.body).isEqualTo("hello".encodeUtf8())
933935
}
936+
937+
@Test
938+
fun dispatcherExceptionClosesConnection() {
939+
server.dispatcher =
940+
object : Dispatcher() {
941+
override fun dispatch(request: RecordedRequest): MockResponse = error("boom")
942+
}
943+
944+
val connection = server.url("/").toUrl().openConnection() as HttpURLConnection
945+
connection.readTimeout = 5_000
946+
assertFailure { connection.responseCode }
947+
.isNotInstanceOf<SocketTimeoutException>()
948+
}
949+
950+
@Test
951+
fun dispatcherErrorClosesConnection() {
952+
server.dispatcher =
953+
object : Dispatcher() {
954+
override fun dispatch(request: RecordedRequest): MockResponse = throw AssertionError("boom")
955+
}
956+
957+
val connection = server.url("/").toUrl().openConnection() as HttpURLConnection
958+
connection.readTimeout = 5_000
959+
assertFailure { connection.responseCode }
960+
.isNotInstanceOf<SocketTimeoutException>()
961+
}
934962
}

0 commit comments

Comments
 (0)