From ee157bdf1a132078b6cdc2302f23b64b853e072b Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 24 Dec 2022 10:35:37 +1000 Subject: [PATCH 1/3] Fix testHeadAfterPut failures --- okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt b/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt index fc9f47ce5309..607c36d5de77 100644 --- a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt +++ b/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt @@ -104,7 +104,7 @@ class CallKotlinTest { server.useHttps(handshakeCertificates.sslSocketFactory()) } - @RetryingTest(5) +// @RetryingTest(5) @Flaky fun testHeadAfterPut() { class ErringRequestBody : RequestBody() { @@ -148,14 +148,14 @@ class CallKotlinTest { .put(ValidRequestBody()) .build() // 201 - client.newCall(request).execute() + client.newCall(request).execute().close() request = Request.Builder() .url(endpointUrl) .head() .build() // 204 - client.newCall(request).execute() + client.newCall(request).execute().close() request = Request.Builder() .url(endpointUrl) @@ -174,7 +174,7 @@ class CallKotlinTest { .head() .build() - client.newCall(request).execute() + client.newCall(request).execute().close() var recordedRequest = server.takeRequest() assertEquals("PUT", recordedRequest.method) From e1631c9ea1fd85958ea48cf2c4e5c14c74eadf25 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 24 Dec 2022 10:36:56 +1000 Subject: [PATCH 2/3] Fix testHeadAfterPut failures --- okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt b/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt index 607c36d5de77..bdb51ebc2da2 100644 --- a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt +++ b/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt @@ -104,7 +104,7 @@ class CallKotlinTest { server.useHttps(handshakeCertificates.sslSocketFactory()) } -// @RetryingTest(5) + @RetryingTest(5) @Flaky fun testHeadAfterPut() { class ErringRequestBody : RequestBody() { From ab89b453f17e1e9604c0b710344c8fa747fa94e0 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 24 Dec 2022 11:45:52 +1000 Subject: [PATCH 3/3] Fix test structure --- .../jvmTest/java/okhttp3/CallKotlinTest.kt | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt b/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt index bdb51ebc2da2..71c078207a32 100644 --- a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt +++ b/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt @@ -147,15 +147,17 @@ class CallKotlinTest { .header("Content-Type", "application/xml") .put(ValidRequestBody()) .build() - // 201 - client.newCall(request).execute().close() + client.newCall(request).execute().use { + assertEquals(201, it.code) + } request = Request.Builder() .url(endpointUrl) .head() .build() - // 204 - client.newCall(request).execute().close() + client.newCall(request).execute().use { + assertEquals(204, it.code) + } request = Request.Builder() .url(endpointUrl) @@ -174,19 +176,9 @@ class CallKotlinTest { .head() .build() - client.newCall(request).execute().close() - - var recordedRequest = server.takeRequest() - assertEquals("PUT", recordedRequest.method) - - recordedRequest = server.takeRequest() - assertEquals("HEAD", recordedRequest.method) - - recordedRequest = server.takeRequest() - assertThat(recordedRequest.failure).isNotNull() - - recordedRequest = server.takeRequest() - assertEquals("HEAD", recordedRequest.method) + client.newCall(request).execute().use { + assertEquals(204, it.code) + } } @Test