Merge Kotlin coroutines 1.5.1HEADandroid-s-beta-5masterandroid-s-beta-5

https://github.com/Kotlin/kotlinx.coroutines/releases/tag/1.5.1

Test: mmma external/kotlinx.coroutines
Change-Id: I7de89ccc26113be895f28935addb27ee07e50ee7

1 files changed, 16 insertions, 0 deletions

diff --git a/ui/kotlinx-coroutines-javafx/test/JavaFxObservableAsFlowTest.kt b/ui/kotlinx-coroutines-javafx/test/JavaFxObservableAsFlowTest.kt
index 69640501..bc40b0fd 100644
--- a/ui/kotlinx-coroutines-javafx/test/JavaFxObservableAsFlowTest.kt
+++ b/ui/kotlinx-coroutines-javafx/test/JavaFxObservableAsFlowTest.kt
@@ -83,4 +83,20 @@ class JavaFxObservableAsFlowTest : TestBase() {
         }
     }
 
+    @Test
+    fun testIntermediateCrash() = runTest {
+        if (!initPlatform()) {
+            println("Skipping JavaFxTest in headless environment")
+            return@runTest // ignore test in headless environments
+        }
+
+        val property = SimpleIntegerProperty(0)
+
+        assertFailsWith<TestException> {
+            property.asFlow().onEach {
+                yield()
+                throw TestException()
+            }.collect()
+        }
+    }
 }