File tree Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -1215,7 +1215,7 @@ time or change existing behaviors in order to make them less surprising/more use
1215
1215
dep). Thanks Charles Cloud for analysing the issue.
1216
1216
1217
1217
- fix conftest related fixture visibility issue: when running with a
1218
- CWD outside a test package pytest would get fixture discovery wrong.
1218
+ CWD outside of a test package pytest would get fixture discovery wrong.
1219
1219
Thanks to Wolfgang Schnerring for figuring out a reproducable example.
1220
1220
1221
1221
- Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the
Original file line number Diff line number Diff line change @@ -433,8 +433,8 @@ def _importtestmodule(self):
433
433
)
434
434
except _pytest .runner .Skipped :
435
435
raise self .CollectError (
436
- "Using @pytest.skip outside a test (e.g. as a test function "
437
- "decorator) is not allowed. Use @pytest.mark.skip or "
436
+ "Using @pytest.skip outside of a test (e.g. as a test "
437
+ "function decorator) is not allowed. Use @pytest.mark.skip or "
438
438
"@pytest.mark.skipif instead."
439
439
)
440
440
self .config .pluginmanager .consider_module (mod )
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ Changes 2.6.3
41
41
dep). Thanks Charles Cloud for analysing the issue.
42
42
43
43
- fix conftest related fixture visibility issue: when running with a
44
- CWD outside a test package pytest would get fixture discovery wrong.
44
+ CWD outside of a test package pytest would get fixture discovery wrong.
45
45
Thanks to Wolfgang Schnerring for figuring out a reproducable example.
46
46
47
47
- Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the
Original file line number Diff line number Diff line change @@ -967,5 +967,5 @@ def test_func():
967
967
""" )
968
968
result = testdir .runpytest ()
969
969
result .stdout .fnmatch_lines (
970
- "*Using @pytest.skip outside a test * is not allowed*"
970
+ "*Using @pytest.skip outside of a test * is not allowed*"
971
971
)
You can’t perform that action at this time.
0 commit comments