Fix the ChannelUndeliveredElementSelectOldStressTest

Author: Nikita Koval

Diff for: kotlinx-coroutines-core/jvm/test/channels/ChannelUndeliveredElementSelectOldStressTest.kt

@@ -201,15 +201,15 @@ class ChannelUndeliveredElementSelectOldStressTest(private val kind: TestChannel
 
     private suspend fun stopReceiver() {
         stoppedReceiver++
-        receiver.cancel()
+        receiver.cancelAndJoin()
         receiverDone.receive()
     }
 
     private inner class Data(val x: Long) {
         private val firstFailedToDeliverOrReceivedCallTrace = atomic<Exception?>(null)
 
         fun failedToDeliver() {
-            val trace = Exception("First onUndeliveredElement() call")
+            val trace = if (TRACING_ENABLED) Exception("First onUndeliveredElement() call") else DUMMY_TRACE_EXCEPTION
             if (firstFailedToDeliverOrReceivedCallTrace.compareAndSet(null, trace)) {
                 failedToDeliverCnt.incrementAndGet()
                 failedStatus[x] = 1
@@ -219,7 +219,7 @@ class ChannelUndeliveredElementSelectOldStressTest(private val kind: TestChannel
         }
 
         fun onReceived() {
-            val trace = Exception("First onReceived() call")
+            val trace = if (TRACING_ENABLED) Exception("First onReceived() call") else DUMMY_TRACE_EXCEPTION
             if (firstFailedToDeliverOrReceivedCallTrace.compareAndSet(null, trace)) return
             throw IllegalStateException("onUndeliveredElement()/onReceived() notified twice", firstFailedToDeliverOrReceivedCallTrace.value!!)
         }
@@ -249,3 +249,6 @@ class ChannelUndeliveredElementSelectOldStressTest(private val kind: TestChannel
         }
     }
 }
+
+private const val TRACING_ENABLED = false // Change to `true` to enable the tracing
+private val DUMMY_TRACE_EXCEPTION = Exception("The tracing is disabled; please enable it by changing the `TRACING_ENABLED` constant to `true`.")

Diff for: kotlinx-coroutines-core/jvm/test/channels/ChannelUndeliveredElementStressTest.kt

@@ -176,7 +176,7 @@ class ChannelUndeliveredElementStressTest(private val kind: TestChannelKind) : T
 
     private suspend fun stopSender() {
         stoppedSender++
-        sender.cancel()
+        sender.cancelAndJoin()
         senderDone.receive()
     }
 
@@ -224,7 +224,7 @@ class ChannelUndeliveredElementStressTest(private val kind: TestChannelKind) : T
         private val firstFailedToDeliverOrReceivedCallTrace = atomic<Exception?>(null)
 
         fun failedToDeliver() {
-            val trace = if (TRACING_ENABLED) Exception("First onUndeliveredElement() call") else DUMMY_TRACING_EXCEPTION
+            val trace = if (TRACING_ENABLED) Exception("First onUndeliveredElement() call") else DUMMY_TRACE_EXCEPTION
             if (firstFailedToDeliverOrReceivedCallTrace.compareAndSet(null, trace)) {
                 failedToDeliverCnt.incrementAndGet()
                 failedStatus[x] = 1
@@ -234,7 +234,7 @@ class ChannelUndeliveredElementStressTest(private val kind: TestChannelKind) : T
         }
 
         fun onReceived() {
-            val trace = if (TRACING_ENABLED) Exception("First onReceived() call") else DUMMY_TRACING_EXCEPTION
+            val trace = if (TRACING_ENABLED) Exception("First onReceived() call") else DUMMY_TRACE_EXCEPTION
             if (firstFailedToDeliverOrReceivedCallTrace.compareAndSet(null, trace)) return
             throw IllegalStateException("onUndeliveredElement()/onReceived() notified twice", firstFailedToDeliverOrReceivedCallTrace.value!!)
         }
@@ -265,5 +265,5 @@ class ChannelUndeliveredElementStressTest(private val kind: TestChannelKind) : T
     }
 }
 
-private const val TRACING_ENABLED = false // Change to `true` to enable tracing while
-private val DUMMY_TRACING_EXCEPTION = Exception("The tracing is disabled; please enable it by changing the `TRACING_ENABLED` constant to `true`.")
+private const val TRACING_ENABLED = false // Change to `true` to enable the tracing
+private val DUMMY_TRACE_EXCEPTION = Exception("The tracing is disabled; please enable it by changing the `TRACING_ENABLED` constant to `true`.")