Skip to content

Commit e306a53

Browse files
committed
Fix spelling: s/outside a/outside of a/
1 parent 9aec8d9 commit e306a53

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ time or change existing behaviors in order to make them less surprising/more use
12151215
dep). Thanks Charles Cloud for analysing the issue.
12161216

12171217
- 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.
12191219
Thanks to Wolfgang Schnerring for figuring out a reproducable example.
12201220

12211221
- Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the

_pytest/python.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,8 @@ def _importtestmodule(self):
433433
)
434434
except _pytest.runner.Skipped:
435435
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 "
438438
"@pytest.mark.skipif instead."
439439
)
440440
self.config.pluginmanager.consider_module(mod)

doc/en/announce/release-2.6.3.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Changes 2.6.3
4141
dep). Thanks Charles Cloud for analysing the issue.
4242

4343
- 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.
4545
Thanks to Wolfgang Schnerring for figuring out a reproducable example.
4646

4747
- Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the

testing/test_skipping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,5 +967,5 @@ def test_func():
967967
""")
968968
result = testdir.runpytest()
969969
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*"
971971
)

0 commit comments

Comments
 (0)