commit 39107ee42697079e84c6e170d0dd5bd1a604efdc
author Roman Elizarov <elizarov@gmail.com> Mon Oct 22 20:48:58 2018 -0700
committer Roman Elizarov <elizarov@gmail.com> Mon Oct 22 20:48:58 2018 -0700
tree 0fddf26e63ef571732c2558eb96babe60071c22a
parent 8a22c548d9dbec68e42fe3e9005ef22cb25c7300
parent 0eee3c3800a9be6bccc6765f94f7babffd6eae3b

Merge branch 'master' into develop

core/kotlinx-coroutines-core/test/UnconfinedConcurrentStressTest.kt

diff --git a/core/kotlinx-coroutines-core/test/UnconfinedConcurrentStressTest.kt b/core/kotlinx-coroutines-core/test/UnconfinedConcurrentStressTest.kt
index 4fe1fd8..0308800 100644
--- a/core/kotlinx-coroutines-core/test/UnconfinedConcurrentStressTest.kt
+++ b/core/kotlinx-coroutines-core/test/UnconfinedConcurrentStressTest.kt
@@ -19,9 +19,9 @@
         executor.close()
     }
 
-    @Test(timeout = 10_000L)
+    @Test
     fun testConcurrent() = runTest {
-        val iterations = 10_000 * stressTestMultiplier
+        val iterations = 1_000 * stressTestMultiplier
         val startBarrier = CyclicBarrier(threads + 1)
         val finishLatch = CountDownLatch(threads)