Snap for 7668063 from 531d55eaeac09ad6cde55687ef802d4235040985 to simpleperf-releasesimpleperf-release

Change-Id: I844c9c61f2e31a265c36a483e1509e0e08c508d6

1 files changed, 2 insertions, 29 deletions

diff --git a/kotlinx-coroutines-core/jvm/test/exceptions/StackTraceRecoveryChannelsTest.kt b/kotlinx-coroutines-core/jvm/test/exceptions/StackTraceRecoveryChannelsTest.kt
index f52f8b5b..2d8c0ebc 100644
--- a/kotlinx-coroutines-core/jvm/test/exceptions/StackTraceRecoveryChannelsTest.kt
+++ b/kotlinx-coroutines-core/jvm/test/exceptions/StackTraceRecoveryChannelsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package kotlinx.coroutines.exceptions
@@ -38,13 +38,6 @@ class StackTraceRecoveryChannelsTest : TestBase() {
     }
 
     @Test
-    fun testReceiveOrNullFromClosedChannel() = runTest {
-        val channel = Channel<Int>()
-        channel.close(RecoverableTestException())
-        channelReceiveOrNull(channel)
-    }
-
-    @Test
     fun testSendToClosedChannel() = runTest {
         val channel = Channel<Int>()
         channel.close(RecoverableTestException())
@@ -67,7 +60,6 @@ class StackTraceRecoveryChannelsTest : TestBase() {
     }
 
     private suspend fun channelReceive(channel: Channel<Int>) = channelOp { channel.receive() }
-    private suspend fun channelReceiveOrNull(channel: Channel<Int>) = channelOp { channel.receiveOrNull() }
 
     private suspend inline fun channelOp(block: () -> Unit) {
         try {
@@ -145,25 +137,6 @@ class StackTraceRecoveryChannelsTest : TestBase() {
         deferred.await()
     }
 
-    // See https://github.com/Kotlin/kotlinx.coroutines/issues/950
-    @Test
-    fun testCancelledOffer() = runTest {
-        expect(1)
-        val job = Job()
-        val actor = actor<Int>(job, Channel.UNLIMITED) {
-            consumeEach {
-                expectUnreached() // is cancelled before offer
-            }
-        }
-        job.cancel()
-        try {
-            actor.offer(1)
-        } catch (e: Exception) {
-            verifyStackTrace("channels/${name.methodName}", e)
-            finish(2)
-        }
-    }
-
     private suspend fun Channel<Int>.sendWithContext(ctx: CoroutineContext) = withContext(ctx) {
         sendInChannel()
         yield() // TCE
@@ -177,4 +150,4 @@ class StackTraceRecoveryChannelsTest : TestBase() {
     private suspend fun Channel<Int>.sendFromScope() = coroutineScope {
         sendWithContext(wrapperDispatcher(coroutineContext))
     }
-}
\ No newline at end of file
+}