Merge remote-tracking branch 'origin/main' into async-tests-issue-warning

jakkdl · jakkdl · commit 45c2ffb635ad · 2024-10-25T12:42:07.000+02:00
diff --git a/testing/python/fixtures.py b/testing/python/fixtures.py
@@ -2996,7 +2996,7 @@ def test_finish():
             *3 passed*
         """
         )
-        result.stdout.no_fnmatch_line("*error*")
+        assert result.ret == 0
 
     def test_fixture_finalizer(self, pytester: Pytester) -> None:
         pytester.makeconftest(

Original file line number	Diff line number	Diff line change
`@@ -2996,7 +2996,7 @@ def test_finish():`
`2996`	`2996`	`3 passed`
`2997`	`2997`	`"""`
`2998`	`2998`	`)`
`2999`		`- result.stdout.no_fnmatch_line("error")`
	`2999`	`+ assert result.ret == 0`
`3000`	`3000`
`3001`	`3001`	`def test_fixture_finalizer(self, pytester: Pytester) -> None:`
`3002`	`3002`	`pytester.makeconftest(`