diff --git a/gradle.properties b/gradle.properties index 147f0e52ae..33d2c395ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ kotlin.code.style=official # config -version=3.0.2-SNAPSHOT +version=3.0.2 ## Performance diff --git a/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/HttpTimeoutTest.kt b/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/HttpTimeoutTest.kt index ff26ae629d..5d2e93d892 100644 --- a/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/HttpTimeoutTest.kt +++ b/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/HttpTimeoutTest.kt @@ -324,6 +324,8 @@ class HttpTimeoutTest : ClientLoader() { } // Js can't configure test timeout in browser + // Fix https://youtrack.jetbrains.com/issue/KTOR-7885 + @Ignore @Test fun testRedirect() = clientTests(listOf("js"), retries = 5) { config { diff --git a/ktor-server/ktor-server-test-suites/common/src/io/ktor/server/testing/suites/HttpServerCommonTestSuite.kt b/ktor-server/ktor-server-test-suites/common/src/io/ktor/server/testing/suites/HttpServerCommonTestSuite.kt index f29594ce51..2ab284af42 100644 --- a/ktor-server/ktor-server-test-suites/common/src/io/ktor/server/testing/suites/HttpServerCommonTestSuite.kt +++ b/ktor-server/ktor-server-test-suites/common/src/io/ktor/server/testing/suites/HttpServerCommonTestSuite.kt @@ -28,8 +28,9 @@ import io.ktor.server.util.* import io.ktor.utils.io.* import io.ktor.utils.io.core.* import kotlinx.coroutines.* -import kotlinx.io.* -import kotlin.coroutines.* +import kotlinx.io.readByteArray +import kotlin.coroutines.AbstractCoroutineContextElement +import kotlin.coroutines.CoroutineContext import kotlin.test.* import kotlin.time.Duration.Companion.minutes @@ -317,6 +318,8 @@ abstract class HttpServerCommonTestSuite