Skip to content

Commit 55e77cf

Browse files
committed
KTOR-8044 Get flaky tests under control
1 parent fab7164 commit 55e77cf

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/HttpTimeoutTest.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,9 @@ class HttpTimeoutTest : ClientLoader(timeout = 3.seconds) {
249249
}
250250

251251
@Test
252-
fun testGetAfterTimeout() = clientTests(except(ENGINES_WITHOUT_REQUEST_TIMEOUT, "Js", "Darwin", "DarwinLegacy")) {
252+
fun testGetAfterTimeout() = clientTests(
253+
except(ENGINES_WITHOUT_REQUEST_TIMEOUT, "Js", "Darwin", "DarwinLegacy", "Curl")
254+
) {
253255
config {
254256
install(HttpTimeout)
255257
}
@@ -270,7 +272,7 @@ class HttpTimeoutTest : ClientLoader(timeout = 3.seconds) {
270272
}
271273

272274
@Test
273-
fun testGetStream() = clientTests {
275+
fun testGetStream() = clientTests(except("Curl")) {
274276
config {
275277
install(HttpTimeout) { requestTimeoutMillis = 1000 }
276278
}
@@ -285,7 +287,7 @@ class HttpTimeoutTest : ClientLoader(timeout = 3.seconds) {
285287
}
286288

287289
@Test
288-
fun testGetStreamRequestTimeout() = clientTests(except(ENGINES_WITHOUT_REQUEST_TIMEOUT)) {
290+
fun testGetStreamRequestTimeout() = clientTests(except(ENGINES_WITHOUT_REQUEST_TIMEOUT, "Curl")) {
289291
config {
290292
install(HttpTimeout) { requestTimeoutMillis = 1000 }
291293
}
@@ -318,7 +320,7 @@ class HttpTimeoutTest : ClientLoader(timeout = 3.seconds) {
318320

319321
// Js can't configure test timeout in browser
320322
@Test
321-
fun testRedirect() = clientTests(except("Js"), retries = 5) {
323+
fun testRedirect() = clientTests(except("Js", "Curl"), retries = 5) {
322324
config {
323325
install(HttpTimeout) { requestTimeoutMillis = 1000 }
324326
}
@@ -475,7 +477,7 @@ class HttpTimeoutTest : ClientLoader(timeout = 3.seconds) {
475477

476478
@Test
477479
fun testSocketTimeoutWriteFailOnWrite() = clientTests(
478-
except(ENGINES_WITHOUT_SOCKET_TIMEOUT, "Android", "native:CIO", "web:CIO", "WinHttp")
480+
except(ENGINES_WITHOUT_SOCKET_TIMEOUT, "Android", "native:CIO", "web:CIO", "WinHttp", "DarwinLegacy")
479481
) {
480482
config {
481483
install(HttpTimeout) { socketTimeoutMillis = 500 }

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/WebSocketTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ class WebSocketTest : ClientLoader() {
279279
}
280280

281281
@Test
282-
fun testCancellingScope() = clientTests(except(ENGINES_WITHOUT_WS)) {
282+
fun testCancellingScope() = clientTests(except(ENGINES_WITHOUT_WS, "Curl")) {
283283
config {
284284
install(WebSockets)
285285
}

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/plugins/CacheLegacyStorageTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class CacheLegacyStorageTest : ClientLoader() {
319319
}
320320

321321
@Test
322-
fun testMaxAge() = clientTests {
322+
fun testMaxAge() = clientTests(except("native:CIO")) {
323323
val publicStorage = HttpCacheStorage.Unlimited()
324324
val privateStorage = HttpCacheStorage.Unlimited()
325325
config {

ktor-network/nix/test/io/ktor/network/sockets/tests/UdpSocketTestNix.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import kotlin.test.*
1313

1414
class UdpSocketTestNix {
1515

16+
@Ignore
1617
@Test
1718
fun testDescriptorClose() = testSuspend {
1819
val selector = SelectorManager()

ktor-server/ktor-server-netty/jvm/test/io/ktor/tests/server/netty/NettyReadRequestTimeoutTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class NettyReadRequestTimeoutTest :
8888
client.performAndCheckRequestWithoutTimeout()
8989
}
9090

91+
@Ignore
9192
@Test
9293
fun `parallel timeout requests`() = requestTimeoutTest(timeout = 1) { _, _ ->
9394
val client = HttpClient()

0 commit comments

Comments
 (0)