Enable flake8-pytest-style

pyproject.toml

@@ -107,6 +107,7 @@ select = [
   "PYI",  # flake8-pyi
   "SIM",  # flake8-simplify
   "TCH",  # flake8-type-checking
+  "PT",  # flake8-pytest-style
 ]
 extend-ignore = [
     'F403',  # undefined-local-with-import-star
@@ -135,6 +136,9 @@ extend-exclude = [
 [tool.ruff.isort]
 combine-as-imports = true
 
+[tool.ruff.flake8-pytest-style]
+fixture-parentheses = false
+
 [tool.mypy]
 python_version = "3.8"
 

trio/_core/_tests/test_guest_mode.py

@@ -25,7 +25,6 @@
 
 import pytest
 from outcome import Outcome
-from pytest import MonkeyPatch, WarningsRecorder
 
 import trio
 import trio.testing
@@ -527,7 +526,7 @@ async def aio_pingpong(
 
 
 def test_guest_mode_internal_errors(
-    monkeypatch: MonkeyPatch, recwarn: WarningsRecorder
+    monkeypatch: pytest.MonkeyPatch, recwarn: pytest.WarningsRecorder
 ) -> None:
     with monkeypatch.context() as m:
 

trio/_core/_tests/test_instrumentation.py

@@ -255,7 +255,7 @@ def after_run(self) -> NoReturn:
             raise ValueError("oops")
 
     async def main() -> None:
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="oops"):
             _core.add_instrument(EvilInstrument())
 
         # Make sure the instrument is fully removed from the per-method lists

trio/_core/_tests/test_io.py

@@ -319,7 +319,7 @@ async def test_wait_on_invalid_object() -> None:
             fileno = s.fileno()
         # We just closed the socket and don't do anything else in between, so
         # we can be confident that the fileno hasn't be reassigned.
-        with pytest.raises(OSError):
+        with pytest.raises(OSError, match="Bad file descriptor"):
             await wait(fileno)
 
 

trio/_core/_tests/test_local.py

@@ -57,13 +57,13 @@ async def reset_check() -> None:
         t2.reset(token2)
         assert t2.get() == "dogfish"
 
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="token has already been used"):
             t2.reset(token2)
 
         token3 = t3.set("basculin")
         assert t3.get() == "basculin"
 
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="TODO: exception text"):
             t1.reset(token3)
 
     run(reset_check)

trio/_core/_tests/test_mock_clock.py

@@ -20,14 +20,14 @@ def test_mock_clock() -> None:
     assert c.current_time() == 0
     c.jump(1.2)
     assert c.current_time() == 1.2
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match="time can't go backwards"):
         c.jump(-1)
     assert c.current_time() == 1.2
     assert c.deadline_to_sleep_time(1.1) == 0
     assert c.deadline_to_sleep_time(1.2) == 0
     assert c.deadline_to_sleep_time(1.3) > 999999
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match="rate must be >= 0"):
         c.rate = -1
     assert c.rate == 0
 

trio/_core/_tests/test_multierror.py

@@ -333,15 +333,15 @@
     # check preservation of __cause__ and __context__
     v = ValueError()
     v.__cause__ = KeyError()
-    with pytest.raises(ValueError) as excinfo:
+    with pytest.raises(ValueError, match="TODO: exception text") as excinfo:
         with pytest.warns(TrioDeprecationWarning), MultiError.catch(lambda exc: exc):
             raise v
     assert isinstance(excinfo.value.__cause__, KeyError)
 
     v = ValueError()
     context = KeyError()
     v.__context__ = context
-    with pytest.raises(ValueError) as excinfo:
+    with pytest.raises(ValueError, match="TODO: exception text") as excinfo:
         with pytest.warns(TrioDeprecationWarning), MultiError.catch(lambda exc: exc):
             raise v
     assert excinfo.value.__context__ is context
@@ -353,7 +353,7 @@
         v.__context__ = context
         v.__suppress_context__ = suppress_context
         distractor = RuntimeError()
-        with pytest.raises(ValueError) as excinfo:
+        with pytest.raises(ValueError, match="TODO: exception text") as excinfo:
 
             def catch_RuntimeError(exc):
                 if isinstance(exc, RuntimeError):

trio/_core/_tests/test_parking_lot.py

@@ -78,7 +78,7 @@ async def waiter(i: int, lot: ParkingLot) -> None:
         )
         lot.unpark_all()
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match="Cannot pop a non-integer number of tasks."):
         lot.unpark(count=1.5)
 
 

trio/_core/_tests/test_run.py

@@ -89,7 +89,7 @@ def test_initial_task_error() -> None:
     async def main(x: object) -> NoReturn:
         raise ValueError(x)
 
-    with pytest.raises(ValueError) as excinfo:
+    with pytest.raises(ValueError, match="17") as excinfo:
         _core.run(main, 17)
     assert excinfo.value.args == (17,)
 
@@ -123,7 +123,7 @@ async def test_nursery_warn_use_async_with() -> None:
 async def test_nursery_main_block_error_basic() -> None:
     exc = ValueError("whoops")
 
-    with pytest.raises(ValueError) as excinfo:
+    with pytest.raises(ValueError, match="whoops") as excinfo:
         async with _core.open_nursery():
             raise exc
     assert excinfo.value is exc
@@ -178,7 +178,7 @@ async def main() -> None:
             nursery.start_soon(looper)
             nursery.start_soon(crasher)
 
-    with pytest.raises(ValueError) as excinfo:
+    with pytest.raises(ValueError, match="argh") as excinfo:
         _core.run(main)
 
     assert looper_record == ["cancelled"]
@@ -224,9 +224,9 @@ async def main() -> None:
 
 async def test_child_crash_wakes_parent() -> None:
     async def crasher() -> NoReturn:
-        raise ValueError
+        raise ValueError("this is a crash")
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match="this is a crash"):
         async with _core.open_nursery() as nursery:
             nursery.start_soon(crasher)
             await sleep_forever()
@@ -244,7 +244,7 @@ async def child1() -> None:
         print("child1 woke")
         assert x == 0
         print("child1 rescheduling t2")
-        _core.reschedule(not_none(t2), outcome.Error(ValueError()))
+        _core.reschedule(not_none(t2), outcome.Error(ValueError("error message")))
         print("child1 exit")
 
     async def child2() -> None:
@@ -253,7 +253,7 @@ async def child2() -> None:
         t2 = _core.current_task()
         _core.reschedule(not_none(t1), outcome.Value(0))
         print("child2 sleep")
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="error message"):
             await sleep_forever()
         print("child2 successful exit")
 
@@ -666,7 +666,8 @@ async def test_unshield_while_cancel_propagating() -> None:
                 await _core.checkpoint()
             finally:
                 inner.shield = True
-    assert outer.cancelled_caught and not inner.cancelled_caught
+    assert outer.cancelled_caught
+    assert not inner.cancelled_caught
 
 
 async def test_cancel_unbound() -> None:
@@ -1023,7 +1024,7 @@ async def test_exc_info() -> None:
     seq = Sequencer()
 
     async def child1() -> None:
-        with pytest.raises(ValueError) as excinfo:
+        with pytest.raises(ValueError, match="child1") as excinfo:
             try:
                 async with seq(0):
                     pass  # we don't yield until seq(2) below
@@ -1114,11 +1115,13 @@ async def child() -> None:
         except Exception:
             await sleep_forever()
 
-    with pytest.raises(ValueError) as excinfo:
+    with pytest.raises(ValueError, match="error text") as excinfo:
         async with _core.open_nursery() as nursery:
             nursery.start_soon(child)
             await wait_all_tasks_blocked()
-            _core.reschedule(not_none(child_task), outcome.Error(ValueError()))
+            _core.reschedule(
+                not_none(child_task), outcome.Error(ValueError("error text"))
+            )
 
     assert isinstance(excinfo.value.__context__, KeyError)
 
@@ -1236,9 +1239,9 @@ async def main() -> None:
         # After main exits but before finally cleaning up, callback processed
         # normally
         token.run_sync_soon(lambda: record.append("sync-cb"))
-        raise ValueError
+        raise ValueError("error text")
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match="error text"):
         _core.run(main)
 
     assert record == ["sync-cb"]
@@ -2312,7 +2315,7 @@ async def do_a_cancel() -> None:
             await sleep_forever()
 
     async def crasher() -> NoReturn:
-        raise ValueError
+        raise ValueError("this is a crash")
 
     old_flags = gc.get_debug()
     try:
@@ -2326,7 +2329,7 @@ async def crasher() -> NoReturn:
         # (See https://github.com/python-trio/trio/pull/1864)
         await do_a_cancel()
 
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="this is a crash"):
             async with _core.open_nursery() as nursery:
                 # cover NurseryManager.__aexit__
                 nursery.start_soon(crasher)
@@ -2346,11 +2349,13 @@ async def test_cancel_scope_exit_doesnt_create_cyclic_garbage() -> None:
     gc.collect()
 
     async def crasher() -> NoReturn:
-        raise ValueError
+        raise ValueError("this is a crash")
 
     old_flags = gc.get_debug()
     try:
-        with pytest.raises(ValueError), _core.CancelScope() as outer:
+        with pytest.raises(
+            ValueError, match="this is a crash"
+        ), _core.CancelScope() as outer:
             async with _core.open_nursery() as nursery:
                 gc.collect()
                 gc.set_debug(gc.DEBUG_SAVEALL)
@@ -2583,7 +2588,7 @@ async def start_raiser() -> None:
                 ) from None
             raise
 
-    with pytest.raises(BaseException) as exc_info:
+    with pytest.raises(BaseException) as exc_info:  # noqa: PT011  # no `match`
         _core.run(start_raiser, strict_exception_groups=run_strict)
 
     if start_raiser_strict or (run_strict and start_raiser_strict is None):

trio/_core/_tests/test_windows.py

@@ -53,7 +53,7 @@ def test_winerror(monkeypatch: pytest.MonkeyPatch) -> None:
     mock.reset_mock()
 
     mock.return_value = (12, "test error")
-    with pytest.raises(OSError) as exc:
+    with pytest.raises(OSError, match="TODO: exception text") as exc:
         raise_winerror(filename="file_1", filename2="file_2")
     mock.assert_called_once_with()
     mock.reset_mock()
@@ -63,7 +63,7 @@ def test_winerror(monkeypatch: pytest.MonkeyPatch) -> None:
     assert exc.value.filename2 == "file_2"
 
     # With an explicit number passed in, it overrides what getwinerror() returns.
-    with pytest.raises(OSError) as exc:
+    with pytest.raises(OSError, match="TODO: exception text") as exc:
         raise_winerror(18, filename="a/file", filename2="b/file")
     mock.assert_called_once_with(18)
     mock.reset_mock()

trio/_tests/test_channel.py

@@ -13,7 +13,7 @@
 async def test_channel() -> None:
     with pytest.raises(TypeError):
         open_memory_channel(1.0)
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match="TODO: exception text"):
         open_memory_channel(-1)
 
     s, r = open_memory_channel[Union[int, str, None]](2)

trio/_tests/test_dtls.py

@@ -98,7 +98,7 @@ async def test_smoke(ipv6: bool) -> None:
             await client_channel.send(b"goodbye")
             assert await client_channel.receive() == b"goodbye"
 
-            with pytest.raises(ValueError):
+            with pytest.raises(ValueError, match="TODO: exception text"):
                 await client_channel.send(b"")
 
             client_channel.set_ciphertext_mtu(1234)
@@ -289,7 +289,7 @@ async def null_handler(_: object) -> None:  # pragma: no cover
 
 async def test_dtls_over_dgram_only() -> None:
     with trio.socket.socket() as s:
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="TODO: exception text"):
             DTLSEndpoint(s)
 
 

trio/_tests/test_exports.py

@@ -116,7 +116,7 @@ def iter_modules(
 # they might be using a newer version of Python with additional symbols which
 # won't be reflected in trio.socket, and this shouldn't cause downstream test
 # runs to start failing.
-@pytest.mark.redistributors_should_skip
+@pytest.mark.redistributors_should_skip()
 # Static analysis tools often have trouble with alpha releases, where Python's
 # internals are in flux, grammar may not have settled down, etc.
 @pytest.mark.skipif(
@@ -192,7 +192,8 @@ def no_underscores(symbols: Iterable[str]) -> set[str]:
         else:
             mod_cache = trio_cache / (modname + ".data.json")
 
-        assert mod_cache.exists() and mod_cache.is_file()
+        assert mod_cache.exists()
+        assert mod_cache.is_file()
         with mod_cache.open() as cache_file:
             cache_json = json.loads(cache_file.read())
             static_names = no_underscores(
@@ -267,7 +268,7 @@ def no_underscores(symbols: Iterable[str]) -> set[str]:
 # modules, instead of once per class.
 @slow
 # see comment on test_static_tool_sees_all_symbols
-@pytest.mark.redistributors_should_skip
+@pytest.mark.redistributors_should_skip()
 # Static analysis tools often have trouble with alpha releases, where Python's
 # internals are in flux, grammar may not have settled down, etc.
 @pytest.mark.skipif(
@@ -314,7 +315,8 @@ def no_hidden(symbols: Iterable[str]) -> set[str]:
         else:
             mod_cache = trio_cache / (modname + ".data.json")
 
-        assert mod_cache.exists() and mod_cache.is_file()
+        assert mod_cache.exists()
+        assert mod_cache.is_file()
         with mod_cache.open() as cache_file:
             cache_json = json.loads(cache_file.read())
 

trio/_tests/test_fakenet.py

@@ -22,7 +22,7 @@ async def test_basic_udp() -> None:
     assert ip == "127.0.0.1"
     assert port != 0
 
-    with pytest.raises(OSError) as exc:  # Cannot rebind.
+    with pytest.raises(OSError, match="TODO: exception text") as exc:  # Cannot rebind.
         await s1.bind(("192.0.2.1", 0))
     assert exc.value.errno == errno.EINVAL
 

trio/_tests/test_highlevel_generic.py

@@ -90,7 +90,7 @@ async def aclose(self) -> NoReturn:
 
     stapled = StapledStream(BrokenSendStream(), BrokenReceiveStream())
 
-    with pytest.raises(ValueError) as excinfo:
+    with pytest.raises(ValueError, match="TODO: exception text") as excinfo:
         await stapled.aclose()
     assert isinstance(excinfo.value.__context__, ValueError)