Merge pull request #1827 from blueyed/Fix-spelling-s-outside-a-outside-of-a-
Fix spelling: s/outside a/outside of a/
This commit is contained in:
		
						commit
						a20c3f9c44
					
				|  | @ -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 | ||||
|  |  | |||
|  | @ -435,8 +435,8 @@ class Module(pytest.File, PyCollector): | |||
|             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) | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -967,5 +967,5 @@ def test_module_level_skip_error(testdir): | |||
|     """) | ||||
|     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*" | ||||
|     ) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue