Include unrelated test fixes for the latest version of trio

Author: noahbkim

tests/test_misc.py

@@ -333,9 +333,9 @@ def collect_exceptions(loop, context):
     )
     expected = [ValueError("hi"), ValueError("lo"), KeyError(), IndexError()]
     await raise_in_aio_loop(expected[0])
-    with trio.testing.RaisesGroup(SystemExit, strict=False):
+    with trio.testing.RaisesGroup(SystemExit, flatten_subgroups=True):
         await raise_in_aio_loop(SystemExit(0))
-    with trio.testing.RaisesGroup(SystemExit, strict=False) as result:
+    with trio.testing.RaisesGroup(SystemExit, flatten_subgroups=True) as result:
         await raise_in_aio_loop(BaseExceptionGroup("", [expected[1], SystemExit()]))
 
     assert len(result.value.exceptions) == 1

tests/test_trio_asyncio.py

@@ -124,7 +124,7 @@ async def test_cancel_loop_with_tasks(autojump_clock, shield, body_raises):
 
     if body_raises:
         catcher = trio.testing.RaisesGroup(
-            trio.testing.Matcher(ValueError, match="hi"), strict=False
+            trio.testing.Matcher(ValueError, match="hi"), flatten_subgroups=True,
         )
     else:
         catcher = contextlib.nullcontext()