Use type match of expected error

goodboy · Oct 15, 2021 · 4f222a5 · 4f222a5
1 parent e4ed0fd
commit 4f222a5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/tests/test_cancellation.py b/tests/test_cancellation.py
@@ -382,7 +382,7 @@ async def test_nested_multierrors(loglevel, start_method):
                             if subsub in (tractor.RemoteActorError,):
                                 subsub = subsub.type
 
-                            assert subsub in (
+                            assert type(subsub) in (
                                 trio.Cancelled,
                                 trio.MultiError,
                             )
@@ -394,13 +394,14 @@ async def test_nested_multierrors(loglevel, start_method):
                     # on windows sometimes spawning is just too slow and
                     # we get back the (sent) cancel signal instead
                     if platform.system() == 'Windows':
-                        assert (subexc.type is trio.MultiError) or (
-                            subexc.type is tractor.RemoteActorError)
+                        if isinstance(subexc, tractor.RemoteActorError):
+                            assert subexc.type in (trio.MultiError, tractor.RemoteActorError)
+                        else:
+                            assert isinstance(subexc, trio.MultiError)
                     else:
                         assert subexc.type is trio.MultiError
                 else:
-                    assert (subexc.type is tractor.RemoteActorError) or (
-                        subexc.type is trio.Cancelled)
+                    assert subexc.type in (tractor.RemoteActorError, trio.Cancelled)
 
 
 @no_windows