Throw unconsumed events if the scope is cancelled #248
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Antimonit
force-pushed
the
unconsumed_events
branch
from
a4967c8
to
6ed1bd5
Compare
jingibus
approved these changes
Jun 26, 2023
| @@ -211,6 +211,7 @@ internal class ChannelTurbine<T>( | |||
| var cause: Throwable? = null | |||
| while (true) { | |||
| val event = channel.takeEventUnsafe() ?: break | |||
| if (event is Event.Error && event.throwable is CancellationException) break | |||
There was a problem hiding this comment.
I really like the idea of just eating these at the source. I had dealt with CancellationException in an ad-hoc manner when implementing turbineScope, and this is much cleaner
| @@ -195,7 +195,8 @@ private fun <T> testInInternal(flow: Flow<T>, timeout: Duration?, scope: Corouti | |||
| if (debug) println("Scope ending ${exception ?: ""}") | |||
|
|
|||
| // Only validate events were consumed if the scope is exiting normally. | |||
| if (exception == null) { | |||
| // CancellationException also indicates _normal_ cancellation of a coroutine. | |||
| if (exception == null || exception is CancellationException) { | |||
There was a problem hiding this comment.
I think we can actually get rid of this whole invokeOnCompletion; turbineScope now has the code to run this validation, so we don't need it here. I'm kinda surprised it works, actually
Does not need to be changed before merge, I'll clean it up in a followup PR
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This potentially fixes #247.