tests/test_context_stream_semantics.py

@@ -263,18 +263,9 @@ def test_simple_context(
         except error_parent:
             pass
         except BaseExceptionGroup as beg:
-            # XXX: on windows — and under `trio>=0.33`'s strict
+            # XXX: on windows it seems we may have to expect the group error
-            # 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
-            assert (
+            assert is_multi_cancelled(beg)
-                is_multi_cancelled(beg)
-                or
-                beg.subgroup(error_parent) is not None
-            )
     else:
         trio.run(main)
 

tests/test_spawning.py

@@ -150,12 +150,7 @@ async def test_most_beautiful_word(
     The main ``tractor`` routine.
 
     '''
-    # actor spawn + IPC round-trip is comfortably sub-second on a
+    with trio.fail_after(1):
-    # 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(
             debug_mode=debug_mode,
         ) as an: