aboutsummaryrefslogtreecommitdiff
path: root/kotlinx-coroutines-debug
diff options
context:
space:
mode:
authorVsevolod Tolstopyatov <qwwdfsad@gmail.com>2019-06-24 20:53:53 +0300
committerVsevolod Tolstopyatov <qwwdfsad@gmail.com>2019-06-24 20:53:53 +0300
commitbb97ffbb069774f2ba6ceb8e7dc4c6a2263ef9ff (patch)
tree396f21e73285c5ae168d1df9f2f9af7b1986e580 /kotlinx-coroutines-debug
parent91d9f7c3e762931d0cd76820ae10321f67a1aae6 (diff)
downloadkotlinx.coroutines-bb97ffbb069774f2ba6ceb8e7dc4c6a2263ef9ff.tar.gz
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)
Diffstat (limited to 'kotlinx-coroutines-debug')
-rw-r--r--kotlinx-coroutines-debug/test/CoroutinesDumpTest.kt1
-rw-r--r--kotlinx-coroutines-debug/test/DebugProbesTest.kt1
-rw-r--r--kotlinx-coroutines-debug/test/DebugTestBase.kt2
-rw-r--r--kotlinx-coroutines-debug/test/SanitizedProbesTest.kt1
4 files changed, 1 insertions, 4 deletions
diff --git a/kotlinx-coroutines-debug/test/CoroutinesDumpTest.kt b/kotlinx-coroutines-debug/test/CoroutinesDumpTest.kt
index 2e0d3c71..ec727014 100644
--- a/kotlinx-coroutines-debug/test/CoroutinesDumpTest.kt
+++ b/kotlinx-coroutines-debug/test/CoroutinesDumpTest.kt
@@ -9,7 +9,6 @@ import org.junit.Test
import kotlin.coroutines.*
import kotlin.test.*
-@Ignore
class CoroutinesDumpTest : DebugTestBase() {
private val monitor = Any()
diff --git a/kotlinx-coroutines-debug/test/DebugProbesTest.kt b/kotlinx-coroutines-debug/test/DebugProbesTest.kt
index b9cecdd7..35d02417 100644
--- a/kotlinx-coroutines-debug/test/DebugProbesTest.kt
+++ b/kotlinx-coroutines-debug/test/DebugProbesTest.kt
@@ -8,7 +8,6 @@ import org.junit.Test
import java.util.concurrent.*
import kotlin.test.*
-@Ignore
class DebugProbesTest : TestBase() {
private fun CoroutineScope.createDeferred(): Deferred<*> = async(NonCancellable) {
diff --git a/kotlinx-coroutines-debug/test/DebugTestBase.kt b/kotlinx-coroutines-debug/test/DebugTestBase.kt
index 7ce21499..3e4abea2 100644
--- a/kotlinx-coroutines-debug/test/DebugTestBase.kt
+++ b/kotlinx-coroutines-debug/test/DebugTestBase.kt
@@ -12,7 +12,7 @@ open class DebugTestBase : TestBase() {
@JvmField
@Rule
- val timeout = CoroutinesTimeout.seconds(10)
+ val timeout = CoroutinesTimeout.seconds(60)
@Before
open fun setUp() {
diff --git a/kotlinx-coroutines-debug/test/SanitizedProbesTest.kt b/kotlinx-coroutines-debug/test/SanitizedProbesTest.kt
index 0085895f..223a3346 100644
--- a/kotlinx-coroutines-debug/test/SanitizedProbesTest.kt
+++ b/kotlinx-coroutines-debug/test/SanitizedProbesTest.kt
@@ -14,7 +14,6 @@ import org.junit.Test
import java.util.concurrent.*
import kotlin.test.*
-@Ignore
class SanitizedProbesTest : DebugTestBase() {
@Before
override fun setUp() {