jc211
/
tractor
forked from goodboy/tractor
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #135 from goodboy/fix_win_ci_again 

Fix windows CI, again.
matrix
goodboy 2020-07-27 13:19:01 -04:00 committed by GitHub
parent ed96672136 5715fd4599
commit 2cc4d7ce04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_cancellation.py
View File

@ -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)

4
tests/test_streaming.py
View File

@ -213,7 +213,7 @@ def time_quad_ex(arb_addr):
def test_a_quadruple_example(time_quad_ex, travis, spawn_backend):
"""This also serves as a kind of "we'd like to be this fast test"."""
if travis and spawn_backend == 'mp' and not platform.system() == 'Windows':
if travis and spawn_backend == 'mp' and (platform.system() != 'Windows'):
# no idea, but the travis, mp, linux runs are flaking out here often
pytest.skip("Test is too flaky on mp in CI")
@ -233,7 +233,7 @@ def test_not_fast_enough_quad(
"""Verify we can cancel midway through the quad example and all actors
cancel gracefully.
"""
if travis and spawn_backend == 'mp' and not platform.system() == 'Windows':
if travis and spawn_backend == 'mp' and (platform.system() != 'Windows'):
# no idea, but the travis, mp, linux runs are flaking out here often
pytest.skip("Test is too flaky on mp in CI")