Skip to content

Commit bb97ffb

Browse files
committed
Unmute debugger test that were broken in 1.3.31, increase debug test timeout (slow CI), make shutdown more graceful by reducing timeout per thread (slow CI + unfortunate timings)
1 parent 91d9f7c commit bb97ffb

File tree

6 files changed

+3
-6
lines changed

6 files changed

+3
-6
lines changed

kotlinx-coroutines-core/jvm/src/scheduling/Dispatcher.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ open class ExperimentalCoroutineDispatcher(
115115
// fot tests only
116116
@Synchronized
117117
internal fun usePrivateScheduler() {
118-
coroutineScheduler.shutdown(10_000L)
118+
coroutineScheduler.shutdown(1_000L)
119119
coroutineScheduler = createScheduler()
120120
}
121121

kotlinx-coroutines-core/jvm/test/TestBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public actual open class TestBase actual constructor() {
5353
private lateinit var threadsBefore: Set<Thread>
5454
private val uncaughtExceptions = Collections.synchronizedList(ArrayList<Throwable>())
5555
private var originalUncaughtExceptionHandler: Thread.UncaughtExceptionHandler? = null
56-
private val SHUTDOWN_TIMEOUT = 10_000L // 10s at most to wait
56+
private val SHUTDOWN_TIMEOUT = 1_000L // 1s at most to wait per thread
5757

5858
/**
5959
* Throws [IllegalStateException] like `error` in stdlib, but also ensures that the test will not

kotlinx-coroutines-debug/test/CoroutinesDumpTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import org.junit.Test
99
import kotlin.coroutines.*
1010
import kotlin.test.*
1111

12-
@Ignore
1312
class CoroutinesDumpTest : DebugTestBase() {
1413
private val monitor = Any()
1514

kotlinx-coroutines-debug/test/DebugProbesTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.junit.Test
88
import java.util.concurrent.*
99
import kotlin.test.*
1010

11-
@Ignore
1211
class DebugProbesTest : TestBase() {
1312

1413
private fun CoroutineScope.createDeferred(): Deferred<*> = async(NonCancellable) {

kotlinx-coroutines-debug/test/DebugTestBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open class DebugTestBase : TestBase() {
1212

1313
@JvmField
1414
@Rule
15-
val timeout = CoroutinesTimeout.seconds(10)
15+
val timeout = CoroutinesTimeout.seconds(60)
1616

1717
@Before
1818
open fun setUp() {

kotlinx-coroutines-debug/test/SanitizedProbesTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import org.junit.Test
1414
import java.util.concurrent.*
1515
import kotlin.test.*
1616

17-
@Ignore
1817
class SanitizedProbesTest : DebugTestBase() {
1918
@Before
2019
override fun setUp() {

0 commit comments

Comments
 (0)