Fix spelling: s/outside a/outside of a/

This commit is contained in:
Daniel Hahler 2016-08-20 18:43:39 +02:00
parent 9aec8d9a47
commit e306a53999
4 changed files with 5 additions and 5 deletions

View File

@ -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. dep). Thanks Charles Cloud for analysing the issue.
- fix conftest related fixture visibility issue: when running with a - 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. Thanks to Wolfgang Schnerring for figuring out a reproducable example.
- Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the - Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the

View File

@ -433,8 +433,8 @@ class Module(pytest.File, PyCollector):
) )
except _pytest.runner.Skipped: except _pytest.runner.Skipped:
raise self.CollectError( raise self.CollectError(
"Using @pytest.skip outside a test (e.g. as a test function " "Using @pytest.skip outside of a test (e.g. as a test "
"decorator) is not allowed. Use @pytest.mark.skip or " "function decorator) is not allowed. Use @pytest.mark.skip or "
"@pytest.mark.skipif instead." "@pytest.mark.skipif instead."
) )
self.config.pluginmanager.consider_module(mod) self.config.pluginmanager.consider_module(mod)

View File

@ -41,7 +41,7 @@ Changes 2.6.3
dep). Thanks Charles Cloud for analysing the issue. dep). Thanks Charles Cloud for analysing the issue.
- fix conftest related fixture visibility issue: when running with a - 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. Thanks to Wolfgang Schnerring for figuring out a reproducable example.
- Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the - Introduce pytest_enter_pdb hook (needed e.g. by pytest_timeout to cancel the

View File

@ -967,5 +967,5 @@ def test_module_level_skip_error(testdir):
""") """)
result = testdir.runpytest() result = testdir.runpytest()
result.stdout.fnmatch_lines( result.stdout.fnmatch_lines(
"*Using @pytest.skip outside a test * is not allowed*" "*Using @pytest.skip outside of a test * is not allowed*"
) )