From e8a38e4d15cc3868496b8880f5b87811f74d929d Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Mon, 27 Jul 2020 11:14:21 -0400 Subject: [PATCH] Fix cancelled type handling --- tests/test_cancellation.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test_cancellation.py b/tests/test_cancellation.py index 6af078c..06aef92 100644 --- a/tests/test_cancellation.py +++ b/tests/test_cancellation.py @@ -331,16 +331,16 @@ async def test_nested_multierrors(loglevel, start_method): # windows is often too slow and cancellation seems # to happen before an actor is spawned - if subexc is trio.Cancelled: + if isinstance(subexc, trio.Cancelled): continue - - # on windows it seems we can't exactly be sure wtf - # will happen.. - assert subexc.type in ( - tractor.RemoteActorError, - trio.Cancelled, - trio.MultiError - ) + else: + # on windows it seems we can't exactly be sure wtf + # will happen.. + assert subexc.type in ( + tractor.RemoteActorError, + trio.Cancelled, + trio.MultiError + ) else: assert isinstance(subexc, tractor.RemoteActorError)