Compare commits
2 Commits
220ef300c7
...
e86b5d4fd0
| Author | SHA1 | Date |
|---|---|---|
|
|
e86b5d4fd0 | |
|
|
886083b5af |
|
|
@ -263,9 +263,18 @@ def test_simple_context(
|
||||||
except error_parent:
|
except error_parent:
|
||||||
pass
|
pass
|
||||||
except BaseExceptionGroup as beg:
|
except BaseExceptionGroup as beg:
|
||||||
# XXX: on windows it seems we may have to expect the group error
|
# XXX: on windows — and under `trio>=0.33`'s strict
|
||||||
|
# exception-groups, where a lone `error_parent` now
|
||||||
|
# arrives wrapped in a 1-exc `ExceptionGroup` rather than
|
||||||
|
# collapsed to the bare exc — accept either the
|
||||||
|
# `error_parent` nested in the group OR a cancel-only
|
||||||
|
# (multi-cancelled) group.
|
||||||
from tractor.trionics import is_multi_cancelled
|
from tractor.trionics import is_multi_cancelled
|
||||||
assert is_multi_cancelled(beg)
|
assert (
|
||||||
|
is_multi_cancelled(beg)
|
||||||
|
or
|
||||||
|
beg.subgroup(error_parent) is not None
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
trio.run(main)
|
trio.run(main)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -150,7 +150,12 @@ async def test_most_beautiful_word(
|
||||||
The main ``tractor`` routine.
|
The main ``tractor`` routine.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
with trio.fail_after(1):
|
# actor spawn + IPC round-trip is comfortably sub-second on a
|
||||||
|
# warm box, but slow/noisy CI runners (esp. macOS) blow a flat
|
||||||
|
# 1s deadline. Scale for CI/CPU-throttle headroom — `== 1s`
|
||||||
|
# locally where `cpu_scaling_factor()` is `1.0`.
|
||||||
|
from .conftest import cpu_scaling_factor
|
||||||
|
with trio.fail_after(1 * cpu_scaling_factor()):
|
||||||
async with tractor.open_nursery(
|
async with tractor.open_nursery(
|
||||||
debug_mode=debug_mode,
|
debug_mode=debug_mode,
|
||||||
) as an:
|
) as an:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue