1.8 KiB
Raw AI output (diff-ref mode)
Step-B2 code lives on drop_ria_nursery after 9201a2ed; per diff-ref mode the verbatim content is reachable via the pointer below.
Generated files
git diff 9201a2ed..drop_ria_nursery -- tractor/runtime/_supervise.py
_open_and_supervise_one_cancels_all_nursery: - removed the outer try: wrapper and the except (Exception, BaseExceptionGroup, trio.Cancelled) as _outer_err: safety-net handler. - the former inner except BaseException is now THE handler, renamed local _inner_err -> _scope_err, de-indented one level; it sets an._scope_error, records errors[uid], waits on the debugger, _join_procs.set(), then a shielded classify/log + snapshot-ria + an.cancel() + 0.5s-bounded _reap_ria_portals(). No re-raise (the finally raises from errors). - finally block unchanged. - dropped the outer_err/inner_err local decls at fn top.
(The diff is large — ~119+/149- — because de-indenting the handler body one level rewrites every line in the block; the logic delta is just “two handlers -> one”.)
Test runs (verbatim)
baseline (pre-B2, step-B tip 9201a2ed), full suite
(dynamic_pub_sub deselected):
1 failed, 300 passed, 9 skipped, 2 deselected, 1 xfailed,
2 xpassed in 1499.49s
-> the 1 failure = test_ext_types_over_ipc[...] trio.TooSlowError
(load-induced; passes 6/6 in isolation in 4.89s)
B2 error/cancel gate:
tests/test_cancellation test_remote_exc_relay
test_inter_peer_cancellation test_advanced_faults
test_oob_cancellation test_to_actor test_spawning test_local
test_rpc
-> 71 passed, 1 xfailed in 125.26s
B2 full-suite run: see b2_full.log