commit 44d28cdd0261b379013f8b9707dbbb461c7428b2
author Roman Elizarov <elizarov@gmail.com> Mon Sep 17 15:03:47 2018 +0300
committer Roman Elizarov <elizarov@gmail.com> Mon Sep 17 15:03:47 2018 +0300
tree f3d96acb9914fc81e55dababd3811ec0a104e795
parent 241e74e6a2cdadaa2753f40a326c732e95fac2d0

Make WithTimeoutOrNullTest.testInnerTimeout less likely to fail under load

common/kotlinx-coroutines-core-common/test/WithTimeoutOrNullTest.kt

diff --git a/common/kotlinx-coroutines-core-common/test/WithTimeoutOrNullTest.kt b/common/kotlinx-coroutines-core-common/test/WithTimeoutOrNullTest.kt
index 26bd555..aa73f5b 100644
--- a/common/kotlinx-coroutines-core-common/test/WithTimeoutOrNullTest.kt
+++ b/common/kotlinx-coroutines-core-common/test/WithTimeoutOrNullTest.kt
@@ -87,7 +87,6 @@
         val value = withTimeoutOrNull(1) {
             channel.receive()
         }
-
         assertNull(value)
     }
 
@@ -99,11 +98,11 @@
     }
 
     @Test
-    fun testInnerTimeoutTest() = runTest(
+    fun testInnerTimeout() = runTest(
         expected = { it is CancellationException }
     ) {
-        withTimeoutOrNull(200) {
-            withTimeout(100) {
+        withTimeoutOrNull(1000) {
+            withTimeout(10) {
                 while (true) {
                     yield()
                 }
@@ -127,7 +126,7 @@
     }
 
     @Test
-    fun testOuterTimeoutTest() = runTest {
+    fun testOuterTimeout() = runTest {
         var counter = 0
         val result = withTimeoutOrNull(250) {
             while (true) {