Skip to content

Commit

Permalink
Update timings in HttpTimeoutTest to reduce number of flaky tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmitrievanthony
dmitrievanthony committed Feb 5, 2020
1 parent ff5f8c8 commit d5f5525
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/HttpTimeoutTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ class HttpTimeoutTest : ClientLoader() {
@Test
fun testGet() = clientTests {
config {
install(HttpTimeout) { requestTimeoutMillis = 500 }
install(HttpTimeout) { requestTimeoutMillis = 1000 }
}

test { client ->
val response = client.get<String>("$TEST_URL/with-delay") {
parameter("delay", 10)
parameter("delay", 20)
}
assertEquals("Text", response)
}
Expand All @@ -39,7 +39,7 @@ class HttpTimeoutTest : ClientLoader() {
val requestBuilder = HttpRequestBuilder().apply {
method = HttpMethod.Get
url("$TEST_URL/404")
parameter("delay", 10)
parameter("delay", 20)
}

val job = requestBuilder.executionContext
Expand Down Expand Up @@ -165,7 +165,7 @@ class HttpTimeoutTest : ClientLoader() {
@Test
fun testGetWithSeparateReceive() = clientTests {
config {
install(HttpTimeout) { requestTimeoutMillis = 500 }
install(HttpTimeout) { requestTimeoutMillis = 1000 }
}

test { client ->
Expand All @@ -190,7 +190,7 @@ class HttpTimeoutTest : ClientLoader() {
method = HttpMethod.Get
parameter("delay", 10)

timeout { requestTimeoutMillis = 500 }
timeout { requestTimeoutMillis = 1000 }
}
val result: String = response.receive()

Expand Down Expand Up @@ -237,7 +237,7 @@ class HttpTimeoutTest : ClientLoader() {
@Test
fun testGetStream() = clientTests {
config {
install(HttpTimeout) { requestTimeoutMillis = 500 }
install(HttpTimeout) { requestTimeoutMillis = 1000 }
}

test { client ->
Expand All @@ -259,7 +259,7 @@ class HttpTimeoutTest : ClientLoader() {
val response = client.get<ByteArray>("$TEST_URL/with-stream") {
parameter("delay", 10)

timeout { requestTimeoutMillis = 500 }
timeout { requestTimeoutMillis = 1000 }
}

assertEquals("Text", String(response))
Expand All @@ -269,13 +269,13 @@ class HttpTimeoutTest : ClientLoader() {
@Test
fun testGetStreamRequestTimeout() = clientTests {
config {
install(HttpTimeout) { requestTimeoutMillis = 500 }
install(HttpTimeout) { requestTimeoutMillis = 1000 }
}

test { client ->
assertFailsAndContainsCause<HttpRequestTimeoutException> {
client.get<ByteArray>("$TEST_URL/with-stream") {
parameter("delay", 200)
parameter("delay", 400)
}
}
}
Expand All @@ -290,9 +290,9 @@ class HttpTimeoutTest : ClientLoader() {
test { client ->
assertFailsAndContainsCause<HttpRequestTimeoutException> {
client.get<ByteArray>("$TEST_URL/with-stream") {
parameter("delay", 200)
parameter("delay", 400)

timeout { requestTimeoutMillis = 500 }
timeout { requestTimeoutMillis = 1000 }
}
}
}
Expand All @@ -301,12 +301,12 @@ class HttpTimeoutTest : ClientLoader() {
@Test
fun testRedirect() = clientTests {
config {
install(HttpTimeout) { requestTimeoutMillis = 500 }
install(HttpTimeout) { requestTimeoutMillis = 1000 }
}

test { client ->
val response = client.get<String>("$TEST_URL/with-redirect") {
parameter("delay", 10)
parameter("delay", 20)
parameter("count", 2)
}

Expand All @@ -322,10 +322,10 @@ class HttpTimeoutTest : ClientLoader() {

test { client ->
val response = client.get<String>("$TEST_URL/with-redirect") {
parameter("delay", 10)
parameter("delay", 20)
parameter("count", 2)

timeout { requestTimeoutMillis = 500 }
timeout { requestTimeoutMillis = 1000 }
}
assertEquals("Text", response)
}
Expand All @@ -334,13 +334,13 @@ class HttpTimeoutTest : ClientLoader() {
@Test
fun testRedirectRequestTimeoutOnFirstStep() = clientTests {
config {
install(HttpTimeout) { requestTimeoutMillis = 10 }
install(HttpTimeout) { requestTimeoutMillis = 20 }
}

test { client ->
assertFailsAndContainsCause<HttpRequestTimeoutException> {
client.get<String>("$TEST_URL/with-redirect") {
parameter("delay", 500)
parameter("delay", 1000)
parameter("count", 5)
}
}
Expand All @@ -356,10 +356,10 @@ class HttpTimeoutTest : ClientLoader() {
test { client ->
assertFailsAndContainsCause<HttpRequestTimeoutException> {
client.get<String>("$TEST_URL/with-redirect") {
parameter("delay", 500)
parameter("delay", 1000)
parameter("count", 5)

timeout { requestTimeoutMillis = 10 }
timeout { requestTimeoutMillis = 20 }
}
}
}
Expand All @@ -368,13 +368,13 @@ class HttpTimeoutTest : ClientLoader() {
@Test
fun testRedirectRequestTimeoutOnSecondStep() = clientTests {
config {
install(HttpTimeout) { requestTimeoutMillis = 200 }
install(HttpTimeout) { requestTimeoutMillis = 400 }
}

test { client ->
assertFailsAndContainsCause<HttpRequestTimeoutException> {
client.get<String>("$TEST_URL/with-redirect") {
parameter("delay", 250)
parameter("delay", 500)
parameter("count", 5)
}
}
Expand All @@ -390,10 +390,10 @@ class HttpTimeoutTest : ClientLoader() {
test { client ->
assertFailsAndContainsCause<HttpRequestTimeoutException> {
client.get<String>("$TEST_URL/with-redirect") {
parameter("delay", 250)
parameter("delay", 500)
parameter("count", 5)

timeout { requestTimeoutMillis = 200 }
timeout { requestTimeoutMillis = 400 }
}
}
}
Expand Down

0 comments on commit d5f5525

Please sign in to comment.