From 916e27eedc1fb89cf8d3256ab810179ac496d902 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Wed, 15 Dec 2021 17:35:28 -0500 Subject: [PATCH] Adjust cancelled test to expect raised overrun error --- tests/test_context_stream_semantics.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/tests/test_context_stream_semantics.py b/tests/test_context_stream_semantics.py index 16587c9..ebf830e 100644 --- a/tests/test_context_stream_semantics.py +++ b/tests/test_context_stream_semantics.py @@ -608,33 +608,19 @@ def test_one_end_stream_not_opened(overrun_by): # 2 overrun cases and the no overrun case (which pushes right up to # the msg limit) - if overrunner == 'caller': + if overrunner == 'caller' or 'cance' in overrunner: with pytest.raises(tractor.RemoteActorError) as excinfo: trio.run(main) assert excinfo.value.type == StreamOverrun - elif 'cancel' in overrunner: - with pytest.raises(trio.MultiError) as excinfo: - trio.run(main) - - multierr = excinfo.value - - for exc in multierr.exceptions: - etype = type(exc) - if etype == tractor.RemoteActorError: - assert exc.type == StreamOverrun - else: - assert etype == tractor.ContextCancelled - elif overrunner == 'callee': with pytest.raises(tractor.RemoteActorError) as excinfo: trio.run(main) # TODO: embedded remote errors so that we can verify the source - # error? - # the callee delivers an error which is an overrun wrapped - # in a remote actor error. + # error? the callee delivers an error which is an overrun + # wrapped in a remote actor error. assert excinfo.value.type == tractor.RemoteActorError else: