Fix race in tests

qwwdfsad · qwwdfsad · commit 83b31965fd3a · 2019-05-28T00:36:56.000+03:00
diff --git a/binary-compatibility-validator/reference-public-api/kotlinx-coroutines-core.txt b/binary-compatibility-validator/reference-public-api/kotlinx-coroutines-core.txt
@@ -802,7 +802,6 @@ public final class kotlinx/coroutines/flow/FlowKt {
 	public static synthetic fun callbackFlow$default (ILkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 	public static final fun channelFlow (ILkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
 	public static synthetic fun channelFlow$default (ILkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
-	public static final fun collect (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun combineLatest (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/flow/Flow;
 	public static final fun combineLatest (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function4;)Lkotlinx/coroutines/flow/Flow;
 	public static final fun combineLatest (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function5;)Lkotlinx/coroutines/flow/Flow;
diff --git a/kotlinx-coroutines-core/jvm/test/flow/CallbackFlowTest.kt b/kotlinx-coroutines-core/jvm/test/flow/CallbackFlowTest.kt
@@ -41,7 +41,7 @@ class CallbackFlowTest : TestBase() {
 
         val flow = channelFlow<Int>(16) {
             api.start(channel)
-            channel.invokeOnClose {
+            awaitClose {
                 api.stop()
             }
         }
@@ -85,7 +85,7 @@ class CallbackFlowTest : TestBase() {
 
         val flow = channelFlow<Int> {
             api.start(channel)
-            channel.invokeOnClose {
+            awaitClose {
                 api.stop()
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class CallbackFlowTest : TestBase() {`
`41`	`41`
`42`	`42`	`val flow = channelFlow<Int>(16) {`
`43`	`43`	`api.start(channel)`
`44`		`- channel.invokeOnClose {`
	`44`	`+ awaitClose {`
`45`	`45`	`api.stop()`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -85,7 +85,7 @@ class CallbackFlowTest : TestBase() {`
`85`	`85`
`86`	`86`	`val flow = channelFlow<Int> {`
`87`	`87`	`api.start(channel)`
`88`		`- channel.invokeOnClose {`
	`88`	`+ awaitClose {`
`89`	`89`	`api.stop()`
`90`	`90`	`}`
`91`	`91`	`}`