mirror of
https://github.com/jlengrand/ktor.git
synced 2026-03-10 08:31:20 +00:00
Update timings in HttpTimeoutTest to reduce number of flaky tests.
This commit is contained in:
committed by
Anton Dmitriev
parent
ff5f8c8b5d
commit
d5f552524f
@@ -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)
|
||||
}
|
||||
@@ -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
|
||||
@@ -165,7 +165,7 @@ class HttpTimeoutTest : ClientLoader() {
|
||||
@Test
|
||||
fun testGetWithSeparateReceive() = clientTests {
|
||||
config {
|
||||
install(HttpTimeout) { requestTimeoutMillis = 500 }
|
||||
install(HttpTimeout) { requestTimeoutMillis = 1000 }
|
||||
}
|
||||
|
||||
test { client ->
|
||||
@@ -190,7 +190,7 @@ class HttpTimeoutTest : ClientLoader() {
|
||||
method = HttpMethod.Get
|
||||
parameter("delay", 10)
|
||||
|
||||
timeout { requestTimeoutMillis = 500 }
|
||||
timeout { requestTimeoutMillis = 1000 }
|
||||
}
|
||||
val result: String = response.receive()
|
||||
|
||||
@@ -237,7 +237,7 @@ class HttpTimeoutTest : ClientLoader() {
|
||||
@Test
|
||||
fun testGetStream() = clientTests {
|
||||
config {
|
||||
install(HttpTimeout) { requestTimeoutMillis = 500 }
|
||||
install(HttpTimeout) { requestTimeoutMillis = 1000 }
|
||||
}
|
||||
|
||||
test { client ->
|
||||
@@ -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))
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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 }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -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 }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -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 }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user