Skip to content

Commit

Permalink
Merge pull request #1827 from blueyed/Fix-spelling-s-outside-a-outsid…
Browse files Browse the repository at this point in the history
…e-of-a-

Fix spelling: s/outside a/outside of a/
  • Loading branch information
The-Compiler authored Aug 20, 2016
2 parents 783aff1 + e306a53 commit a20c3f9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ time or change existing behaviors in order to make them less surprising/more use
dep). Thanks Charles Cloud for analysing the issue.

- fix conftest related fixture visibility issue: when running with a
CWD outside a test package pytest would get fixture discovery wrong.
CWD outside of a test package pytest would get fixture discovery wrong.
Thanks to Wolfgang Schnerring for figuring out a reproducable example.

- Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the
Expand Down
4 changes: 2 additions & 2 deletions _pytest/python.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,8 @@ def _importtestmodule(self):
if e.allow_module_level:
raise
raise self.CollectError(
"Using @pytest.skip outside a test (e.g. as a test function "
"decorator) is not allowed. Use @pytest.mark.skip or "
"Using @pytest.skip outside of a test (e.g. as a test "
"function decorator) is not allowed. Use @pytest.mark.skip or "
"@pytest.mark.skipif instead."
)
self.config.pluginmanager.consider_module(mod)
Expand Down
2 changes: 1 addition & 1 deletion doc/en/announce/release-2.6.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Changes 2.6.3
dep). Thanks Charles Cloud for analysing the issue.

- fix conftest related fixture visibility issue: when running with a
CWD outside a test package pytest would get fixture discovery wrong.
CWD outside of a test package pytest would get fixture discovery wrong.
Thanks to Wolfgang Schnerring for figuring out a reproducable example.

- Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the
Expand Down
2 changes: 1 addition & 1 deletion testing/test_skipping.py
Original file line number Diff line number Diff line change
Expand Up @@ -967,5 +967,5 @@ def test_func():
""")
result = testdir.runpytest()
result.stdout.fnmatch_lines(
"*Using @pytest.skip outside a test * is not allowed*"
"*Using @pytest.skip outside of a test * is not allowed*"
)

0 comments on commit a20c3f9

Please sign in to comment.