From e306a53999aaa4b8122a99910469fbb1c4c9e7fa Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 20 Aug 2016 18:43:39 +0200 Subject: [PATCH] Fix spelling: s/outside a/outside of a/ --- CHANGELOG.rst | 2 +- _pytest/python.py | 4 ++-- doc/en/announce/release-2.6.3.rst | 2 +- testing/test_skipping.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e8ad90ff748..0e0e09d0034 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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 diff --git a/_pytest/python.py b/_pytest/python.py index 9e9c788970c..476c20c9cff 100644 --- a/_pytest/python.py +++ b/_pytest/python.py @@ -433,8 +433,8 @@ def _importtestmodule(self): ) except _pytest.runner.Skipped: 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) diff --git a/doc/en/announce/release-2.6.3.rst b/doc/en/announce/release-2.6.3.rst index 13fae31b8a1..c1d0ad27826 100644 --- a/doc/en/announce/release-2.6.3.rst +++ b/doc/en/announce/release-2.6.3.rst @@ -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 diff --git a/testing/test_skipping.py b/testing/test_skipping.py index b11f668587a..12b18ca3300 100644 --- a/testing/test_skipping.py +++ b/testing/test_skipping.py @@ -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*" )