diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9b4c6355d0a..06ea24e233e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,6 +18,44 @@ with advance notice in the **Deprecations** section of releases. .. towncrier release notes start +pytest 3.9.3 (2018-10-27) +========================= + +Bug Fixes +--------- + +- `#4174 `_: Fix "ValueError: Plugin already registered" with conftest plugins via symlink. + + +- `#4181 `_: Handle race condition between creation and deletion of temporary folders. + + +- `#4221 `_: Fix bug where the warning summary at the end of the test session was not showing the test where the warning was originated. + + +- `#4243 `_: Fix regression when ``stacklevel`` for warnings was passed as positional argument on python2. + + + +Improved Documentation +---------------------- + +- `#3851 `_: Add reference to ``empty_parameter_set_mark`` ini option in documentation of ``@pytest.mark.parametrize`` + + + +Trivial/Internal Changes +------------------------ + +- `#4028 `_: Revert patching of ``sys.breakpointhook`` since it appears to do nothing. + + +- `#4233 `_: Apply an import sorter (``reorder-python-imports``) to the codebase. + + +- `#4248 `_: Remove use of unnecessary compat shim, six.binary_type + + pytest 3.9.2 (2018-10-22) ========================= diff --git a/changelog/3851.doc.rst b/changelog/3851.doc.rst deleted file mode 100644 index ec46126f12f..00000000000 --- a/changelog/3851.doc.rst +++ /dev/null @@ -1 +0,0 @@ -Add reference to ``empty_parameter_set_mark`` ini option in documentation of ``@pytest.mark.parametrize`` diff --git a/changelog/4028.trivial.rst b/changelog/4028.trivial.rst deleted file mode 100644 index 2ec5f6306af..00000000000 --- a/changelog/4028.trivial.rst +++ /dev/null @@ -1 +0,0 @@ -Revert patching of ``sys.breakpointhook`` since it appears to do nothing. diff --git a/changelog/4174.bugfix.rst b/changelog/4174.bugfix.rst deleted file mode 100644 index 5e263c23a45..00000000000 --- a/changelog/4174.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix "ValueError: Plugin already registered" with conftest plugins via symlink. diff --git a/changelog/4221.bugfix.rst b/changelog/4221.bugfix.rst deleted file mode 100644 index f55722f1c5f..00000000000 --- a/changelog/4221.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix bug where the warning summary at the end of the test session was not showing the test where the warning was originated. diff --git a/changelog/4233.trivial.rst b/changelog/4233.trivial.rst deleted file mode 100644 index e3c5125c077..00000000000 --- a/changelog/4233.trivial.rst +++ /dev/null @@ -1 +0,0 @@ -Apply an import sorter (``reorder-python-imports``) to the codebase. diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst index a39be6b17ac..3d019ad80a8 100644 --- a/doc/en/announce/index.rst +++ b/doc/en/announce/index.rst @@ -6,6 +6,7 @@ Release announcements :maxdepth: 2 + release-3.9.3 release-3.9.2 release-3.9.1 release-3.9.0 diff --git a/doc/en/announce/release-3.9.3.rst b/doc/en/announce/release-3.9.3.rst new file mode 100644 index 00000000000..8d84b4cabcb --- /dev/null +++ b/doc/en/announce/release-3.9.3.rst @@ -0,0 +1,24 @@ +pytest-3.9.3 +======================================= + +pytest 3.9.3 has just been released to PyPI. + +This is a bug-fix release, being a drop-in replacement. To upgrade:: + + pip install --upgrade pytest + +The full changelog is available at https://docs.pytest.org/en/latest/changelog.html. + +Thanks to all who contributed to this release, among them: + +* Andreas Profous +* Ankit Goel +* Anthony Sottile +* Bruno Oliveira +* Daniel Hahler +* Jon Dufresne +* Ronny Pfannschmidt + + +Happy testing, +The pytest Development Team diff --git a/doc/en/builtin.rst b/doc/en/builtin.rst index f921b5d6417..60681bc9b2a 100644 --- a/doc/en/builtin.rst +++ b/doc/en/builtin.rst @@ -75,7 +75,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a caplog Access and control log capturing. - Captured logs are available through the following methods:: + Captured logs are available through the following properties/methods:: * caplog.text -> string containing formatted log output * caplog.records -> list of logging.LogRecord instances diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst index 7dca5510ac1..868dfcf57fd 100644 --- a/doc/en/example/parametrize.rst +++ b/doc/en/example/parametrize.rst @@ -413,7 +413,7 @@ Running it results in some skips if we don't have all the python interpreters in . $ pytest -rs -q multipython.py ...sss...sssssssss...sss... [100%] ========================= short test summary info ========================== - SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:29: 'python3.4' not found + SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.4' not found 12 passed, 15 skipped in 0.12 seconds Indirect parametrization of optional implementations/imports diff --git a/doc/en/example/reportingdemo.rst b/doc/en/example/reportingdemo.rst index fb117d06c7a..c599fe6b3de 100644 --- a/doc/en/example/reportingdemo.rst +++ b/doc/en/example/reportingdemo.rst @@ -26,7 +26,7 @@ get on the terminal - we are working on that):: > assert param1 * 2 < param2 E assert (3 * 2) < 6 - failure_demo.py:19: AssertionError + failure_demo.py:20: AssertionError _________________________ TestFailing.test_simple __________________________ self = @@ -43,7 +43,7 @@ get on the terminal - we are working on that):: E + where 42 = .f at 0xdeadbeef>() E + and 43 = .g at 0xdeadbeef>() - failure_demo.py:35: AssertionError + failure_demo.py:36: AssertionError ____________________ TestFailing.test_simple_multiline _____________________ self = @@ -51,7 +51,7 @@ get on the terminal - we are working on that):: def test_simple_multiline(self): > otherfunc_multi(42, 6 * 9) - failure_demo.py:38: + failure_demo.py:39: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ a = 42, b = 54 @@ -60,7 +60,7 @@ get on the terminal - we are working on that):: > assert a == b E assert 42 == 54 - failure_demo.py:15: AssertionError + failure_demo.py:16: AssertionError ___________________________ TestFailing.test_not ___________________________ self = @@ -73,7 +73,7 @@ get on the terminal - we are working on that):: E assert not 42 E + where 42 = .f at 0xdeadbeef>() - failure_demo.py:44: AssertionError + failure_demo.py:45: AssertionError _________________ TestSpecialisedExplanations.test_eq_text _________________ self = @@ -84,7 +84,7 @@ get on the terminal - we are working on that):: E - spam E + eggs - failure_demo.py:49: AssertionError + failure_demo.py:50: AssertionError _____________ TestSpecialisedExplanations.test_eq_similar_text _____________ self = @@ -97,7 +97,7 @@ get on the terminal - we are working on that):: E + foo 2 bar E ? ^ - failure_demo.py:52: AssertionError + failure_demo.py:53: AssertionError ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________ self = @@ -110,7 +110,7 @@ get on the terminal - we are working on that):: E + eggs E bar - failure_demo.py:55: AssertionError + failure_demo.py:56: AssertionError ______________ TestSpecialisedExplanations.test_eq_long_text _______________ self = @@ -127,7 +127,7 @@ get on the terminal - we are working on that):: E + 1111111111b222222222 E ? ^ - failure_demo.py:60: AssertionError + failure_demo.py:61: AssertionError _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________ self = @@ -147,7 +147,7 @@ get on the terminal - we are working on that):: E E ...Full output truncated (7 lines hidden), use '-vv' to show - failure_demo.py:65: AssertionError + failure_demo.py:66: AssertionError _________________ TestSpecialisedExplanations.test_eq_list _________________ self = @@ -158,7 +158,7 @@ get on the terminal - we are working on that):: E At index 2 diff: 2 != 3 E Use -v to get the full diff - failure_demo.py:68: AssertionError + failure_demo.py:69: AssertionError ______________ TestSpecialisedExplanations.test_eq_list_long _______________ self = @@ -171,7 +171,7 @@ get on the terminal - we are working on that):: E At index 100 diff: 1 != 2 E Use -v to get the full diff - failure_demo.py:73: AssertionError + failure_demo.py:74: AssertionError _________________ TestSpecialisedExplanations.test_eq_dict _________________ self = @@ -189,7 +189,7 @@ get on the terminal - we are working on that):: E E ...Full output truncated (2 lines hidden), use '-vv' to show - failure_demo.py:76: AssertionError + failure_demo.py:77: AssertionError _________________ TestSpecialisedExplanations.test_eq_set __________________ self = @@ -207,7 +207,7 @@ get on the terminal - we are working on that):: E E ...Full output truncated (2 lines hidden), use '-vv' to show - failure_demo.py:79: AssertionError + failure_demo.py:80: AssertionError _____________ TestSpecialisedExplanations.test_eq_longer_list ______________ self = @@ -218,7 +218,7 @@ get on the terminal - we are working on that):: E Right contains more items, first extra item: 3 E Use -v to get the full diff - failure_demo.py:82: AssertionError + failure_demo.py:83: AssertionError _________________ TestSpecialisedExplanations.test_in_list _________________ self = @@ -227,7 +227,7 @@ get on the terminal - we are working on that):: > assert 1 in [0, 2, 3, 4, 5] E assert 1 in [0, 2, 3, 4, 5] - failure_demo.py:85: AssertionError + failure_demo.py:86: AssertionError __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ self = @@ -246,7 +246,7 @@ get on the terminal - we are working on that):: E E ...Full output truncated (2 lines hidden), use '-vv' to show - failure_demo.py:89: AssertionError + failure_demo.py:90: AssertionError ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ self = @@ -259,7 +259,7 @@ get on the terminal - we are working on that):: E single foo line E ? +++ - failure_demo.py:93: AssertionError + failure_demo.py:94: AssertionError _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ self = @@ -272,7 +272,7 @@ get on the terminal - we are working on that):: E head head foo tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail E ? +++ - failure_demo.py:97: AssertionError + failure_demo.py:98: AssertionError ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ self = @@ -285,7 +285,7 @@ get on the terminal - we are working on that):: E head head fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffftail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail E ? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - failure_demo.py:101: AssertionError + failure_demo.py:102: AssertionError ______________________________ test_attribute ______________________________ def test_attribute(): @@ -297,7 +297,7 @@ get on the terminal - we are working on that):: E assert 1 == 2 E + where 1 = .Foo object at 0xdeadbeef>.b - failure_demo.py:109: AssertionError + failure_demo.py:110: AssertionError _________________________ test_attribute_instance __________________________ def test_attribute_instance(): @@ -309,7 +309,7 @@ get on the terminal - we are working on that):: E + where 1 = .Foo object at 0xdeadbeef>.b E + where .Foo object at 0xdeadbeef> = .Foo'>() - failure_demo.py:116: AssertionError + failure_demo.py:117: AssertionError __________________________ test_attribute_failure __________________________ def test_attribute_failure(): @@ -322,7 +322,7 @@ get on the terminal - we are working on that):: i = Foo() > assert i.b == 2 - failure_demo.py:127: + failure_demo.py:128: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ self = .Foo object at 0xdeadbeef> @@ -331,7 +331,7 @@ get on the terminal - we are working on that):: > raise Exception("Failed to get attrib") E Exception: Failed to get attrib - failure_demo.py:122: Exception + failure_demo.py:123: Exception _________________________ test_attribute_multiple __________________________ def test_attribute_multiple(): @@ -348,7 +348,7 @@ get on the terminal - we are working on that):: E + and 2 = .Bar object at 0xdeadbeef>.b E + where .Bar object at 0xdeadbeef> = .Bar'>() - failure_demo.py:137: AssertionError + failure_demo.py:138: AssertionError __________________________ TestRaises.test_raises __________________________ self = @@ -357,7 +357,7 @@ get on the terminal - we are working on that):: s = "qwe" # NOQA > raises(TypeError, "int(s)") - failure_demo.py:147: + failure_demo.py:148: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ > int(s) @@ -372,7 +372,7 @@ get on the terminal - we are working on that):: > raises(IOError, "int('3')") E Failed: DID NOT RAISE - failure_demo.py:150: Failed + failure_demo.py:151: Failed __________________________ TestRaises.test_raise ___________________________ self = @@ -381,7 +381,7 @@ get on the terminal - we are working on that):: > raise ValueError("demo error") E ValueError: demo error - failure_demo.py:153: ValueError + failure_demo.py:154: ValueError ________________________ TestRaises.test_tupleerror ________________________ self = @@ -390,7 +390,7 @@ get on the terminal - we are working on that):: > a, b = [1] # NOQA E ValueError: not enough values to unpack (expected 2, got 1) - failure_demo.py:156: ValueError + failure_demo.py:157: ValueError ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______ self = @@ -401,7 +401,7 @@ get on the terminal - we are working on that):: > a, b = items.pop() E TypeError: 'int' object is not iterable - failure_demo.py:161: TypeError + failure_demo.py:162: TypeError --------------------------- Captured stdout call --------------------------- items is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ @@ -412,7 +412,7 @@ get on the terminal - we are working on that):: > if namenotexi: # NOQA E NameError: name 'namenotexi' is not defined - failure_demo.py:164: NameError + failure_demo.py:165: NameError ____________________ test_dynamic_compile_shows_nicely _____________________ def test_dynamic_compile_shows_nicely(): @@ -427,14 +427,14 @@ get on the terminal - we are working on that):: sys.modules[name] = module > module.foo() - failure_demo.py:182: + failure_demo.py:183: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ def foo(): > assert 1 == 0 E AssertionError - <2-codegen 'abc-123' $REGENDOC_TMPDIR/assertion/failure_demo.py:179>:2: AssertionError + <2-codegen 'abc-123' $REGENDOC_TMPDIR/assertion/failure_demo.py:180>:2: AssertionError ____________________ TestMoreErrors.test_complex_error _____________________ self = @@ -448,9 +448,9 @@ get on the terminal - we are working on that):: > somefunc(f(), g()) - failure_demo.py:193: + failure_demo.py:194: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - failure_demo.py:11: in somefunc + failure_demo.py:12: in somefunc otherfunc(x, y) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ @@ -460,7 +460,7 @@ get on the terminal - we are working on that):: > assert a == b E assert 44 == 43 - failure_demo.py:7: AssertionError + failure_demo.py:8: AssertionError ___________________ TestMoreErrors.test_z1_unpack_error ____________________ self = @@ -470,7 +470,7 @@ get on the terminal - we are working on that):: > a, b = items E ValueError: not enough values to unpack (expected 2, got 0) - failure_demo.py:197: ValueError + failure_demo.py:198: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ self = @@ -480,7 +480,7 @@ get on the terminal - we are working on that):: > a, b = items E TypeError: 'int' object is not iterable - failure_demo.py:201: TypeError + failure_demo.py:202: TypeError ______________________ TestMoreErrors.test_startswith ______________________ self = @@ -493,7 +493,7 @@ get on the terminal - we are working on that):: E + where False = ('456') E + where = '123'.startswith - failure_demo.py:206: AssertionError + failure_demo.py:207: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ self = @@ -512,7 +512,7 @@ get on the terminal - we are working on that):: E + where '123' = .f at 0xdeadbeef>() E + and '456' = .g at 0xdeadbeef>() - failure_demo.py:215: AssertionError + failure_demo.py:216: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ self = @@ -523,7 +523,7 @@ get on the terminal - we are working on that):: E + where False = isinstance(43, float) E + where 43 = globf(42) - failure_demo.py:218: AssertionError + failure_demo.py:219: AssertionError _______________________ TestMoreErrors.test_instance _______________________ self = @@ -534,7 +534,7 @@ get on the terminal - we are working on that):: E assert 42 != 42 E + where 42 = .x - failure_demo.py:222: AssertionError + failure_demo.py:223: AssertionError _______________________ TestMoreErrors.test_compare ________________________ self = @@ -544,7 +544,7 @@ get on the terminal - we are working on that):: E assert 11 < 5 E + where 11 = globf(10) - failure_demo.py:225: AssertionError + failure_demo.py:226: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ self = @@ -555,7 +555,7 @@ get on the terminal - we are working on that):: > assert x == 0 E assert 1 == 0 - failure_demo.py:230: AssertionError + failure_demo.py:231: AssertionError ___________________ TestCustomAssertMsg.test_single_line ___________________ self = @@ -570,7 +570,7 @@ get on the terminal - we are working on that):: E assert 1 == 2 E + where 1 = .A'>.a - failure_demo.py:241: AssertionError + failure_demo.py:242: AssertionError ____________________ TestCustomAssertMsg.test_multiline ____________________ self = @@ -589,7 +589,7 @@ get on the terminal - we are working on that):: E assert 1 == 2 E + where 1 = .A'>.a - failure_demo.py:248: AssertionError + failure_demo.py:249: AssertionError ___________________ TestCustomAssertMsg.test_custom_repr ___________________ self = @@ -611,11 +611,12 @@ get on the terminal - we are working on that):: E assert 1 == 2 E + where 1 = This is JSON\n{\n 'foo': 'bar'\n}.a - failure_demo.py:261: AssertionError + failure_demo.py:262: AssertionError ============================= warnings summary ============================= - $REGENDOC_TMPDIR/assertion/failure_demo.py:24: RemovedInPytest4Warning: Metafunc.addcall is deprecated and scheduled to be removed in pytest 4.0. - Please use Metafunc.parametrize instead. - metafunc.addcall(funcargs=dict(param1=3, param2=6)) + failure_demo.py:25 + $REGENDOC_TMPDIR/assertion/failure_demo.py:25: RemovedInPytest4Warning: Metafunc.addcall is deprecated and scheduled to be removed in pytest 4.0. + Please use Metafunc.parametrize instead. + metafunc.addcall(funcargs=dict(param1=3, param2=6)) -- Docs: https://docs.pytest.org/en/latest/warnings.html ================== 42 failed, 1 warnings in 0.12 seconds =================== diff --git a/doc/en/warnings.rst b/doc/en/warnings.rst index f83377cf68f..31bd746957c 100644 --- a/doc/en/warnings.rst +++ b/doc/en/warnings.rst @@ -29,8 +29,9 @@ Running pytest now produces this output:: test_show_warnings.py . [100%] ============================= warnings summary ============================= - $REGENDOC_TMPDIR/test_show_warnings.py:4: UserWarning: api v1, should use functions from v2 - warnings.warn(UserWarning("api v1, should use functions from v2")) + test_show_warnings.py::test_one + $REGENDOC_TMPDIR/test_show_warnings.py:4: UserWarning: api v1, should use functions from v2 + warnings.warn(UserWarning("api v1, should use functions from v2")) -- Docs: https://docs.pytest.org/en/latest/warnings.html =================== 1 passed, 1 warnings in 0.12 seconds =================== @@ -351,8 +352,9 @@ defines an ``__init__`` constructor, as this prevents the class from being insta $ pytest test_pytest_warnings.py -q ============================= warnings summary ============================= - $REGENDOC_TMPDIR/test_pytest_warnings.py:1: PytestWarning: cannot collect test class 'Test' because it has a __init__ constructor - class Test: + test_pytest_warnings.py:1 + $REGENDOC_TMPDIR/test_pytest_warnings.py:1: PytestWarning: cannot collect test class 'Test' because it has a __init__ constructor + class Test: -- Docs: https://docs.pytest.org/en/latest/warnings.html 1 warnings in 0.12 seconds diff --git a/doc/en/writing_plugins.rst b/doc/en/writing_plugins.rst index 8ac31657851..027a087b4e4 100644 --- a/doc/en/writing_plugins.rst +++ b/doc/en/writing_plugins.rst @@ -418,20 +418,21 @@ additionally it is possible to copy examples for a example folder before running test_example.py .. [100%] ============================= warnings summary ============================= - $REGENDOC_TMPDIR/test_example.py:4: PytestExperimentalApiWarning: testdir.copy_example is an experimental api that may change over time - testdir.copy_example("test_example.py") - $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:329: RemovedInPytest4Warning: usage of Session.Class is deprecated, please use pytest.Class instead - return getattr(object, name, default) - $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:329: RemovedInPytest4Warning: usage of Session.File is deprecated, please use pytest.File instead - return getattr(object, name, default) - $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:329: RemovedInPytest4Warning: usage of Session.Function is deprecated, please use pytest.Function instead - return getattr(object, name, default) - $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:329: RemovedInPytest4Warning: usage of Session.Instance is deprecated, please use pytest.Instance instead - return getattr(object, name, default) - $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:329: RemovedInPytest4Warning: usage of Session.Item is deprecated, please use pytest.Item instead - return getattr(object, name, default) - $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:329: RemovedInPytest4Warning: usage of Session.Module is deprecated, please use pytest.Module instead - return getattr(object, name, default) + test_example.py::test_plugin + $REGENDOC_TMPDIR/test_example.py:4: PytestExperimentalApiWarning: testdir.copy_example is an experimental api that may change over time + testdir.copy_example("test_example.py") + $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:332: RemovedInPytest4Warning: usage of Session.Class is deprecated, please use pytest.Class instead + return getattr(object, name, default) + $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:332: RemovedInPytest4Warning: usage of Session.File is deprecated, please use pytest.File instead + return getattr(object, name, default) + $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:332: RemovedInPytest4Warning: usage of Session.Function is deprecated, please use pytest.Function instead + return getattr(object, name, default) + $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:332: RemovedInPytest4Warning: usage of Session.Instance is deprecated, please use pytest.Instance instead + return getattr(object, name, default) + $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:332: RemovedInPytest4Warning: usage of Session.Item is deprecated, please use pytest.Item instead + return getattr(object, name, default) + $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/compat.py:332: RemovedInPytest4Warning: usage of Session.Module is deprecated, please use pytest.Module instead + return getattr(object, name, default) -- Docs: https://docs.pytest.org/en/latest/warnings.html =================== 2 passed, 7 warnings in 0.12 seconds =================== diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py index f6a67d5607e..806a9d63f1d 100644 --- a/src/_pytest/config/__init__.py +++ b/src/_pytest/config/__init__.py @@ -389,13 +389,13 @@ def _getconftestmodules(self, path): if self._noconftest: return [] - if path.isfile(): - directory = path.dirpath() - else: - directory = path try: - return self._path2confmods[directory] + return self._path2confmods[path] except KeyError: + if path.isfile(): + directory = path.dirpath() + else: + directory = path # XXX these days we may rather want to use config.rootdir # and allow users to opt into looking into the rootdir parent # directories instead of requiring to specify confcutdir @@ -408,7 +408,7 @@ def _getconftestmodules(self, path): mod = self._importconftest(conftestpath) clist.append(mod) - self._path2confmods[directory] = clist + self._path2confmods[path] = clist return clist def _rget_with_confmod(self, name, path): diff --git a/src/_pytest/pathlib.py b/src/_pytest/pathlib.py index b452c794da6..f5c1da8c506 100644 --- a/src/_pytest/pathlib.py +++ b/src/_pytest/pathlib.py @@ -151,7 +151,7 @@ def create_cleanup_lock(p): else: pid = os.getpid() spid = str(pid) - if not isinstance(spid, six.binary_type): + if not isinstance(spid, bytes): spid = spid.encode("ascii") os.write(fd, spid) os.close(fd) @@ -177,9 +177,15 @@ def cleanup_on_exit(lock_path=lock_path, original_pid=pid): return register(cleanup_on_exit) -def delete_a_numbered_dir(path): - """removes a numbered directory""" - create_cleanup_lock(path) +def maybe_delete_a_numbered_dir(path): + """removes a numbered directory if its lock can be obtained""" + try: + create_cleanup_lock(path) + except (OSError, EnvironmentError): + # known races: + # * other process did a cleanup at the same time + # * deletable folder was found + return parent = path.parent garbage = parent.joinpath("garbage-{}".format(uuid.uuid4())) @@ -209,7 +215,7 @@ def ensure_deletable(path, consider_lock_dead_if_created_before): def try_cleanup(path, consider_lock_dead_if_created_before): """tries to cleanup a folder if we can ensure its deletable""" if ensure_deletable(path, consider_lock_dead_if_created_before): - delete_a_numbered_dir(path) + maybe_delete_a_numbered_dir(path) def cleanup_candidates(root, prefix, keep): diff --git a/src/_pytest/recwarn.py b/src/_pytest/recwarn.py index 4049110c5a2..4f3ab7f2997 100644 --- a/src/_pytest/recwarn.py +++ b/src/_pytest/recwarn.py @@ -156,21 +156,27 @@ def __enter__(self): # trivial patching of `warnings.warn` seems to be enough somehow? if six.PY2: - def warn(*args, **kwargs): - kwargs.setdefault("stacklevel", 1) - kwargs["stacklevel"] += 1 + def warn(message, category=None, stacklevel=1): + # duplicate the stdlib logic due to + # bad handing in the c version of warnings + if isinstance(message, Warning): + category = message.__class__ + # Check category argument + if category is None: + category = UserWarning + assert issubclass(category, Warning) # emulate resetting the warn registry - f_globals = sys._getframe(kwargs["stacklevel"] - 1).f_globals + f_globals = sys._getframe(stacklevel).f_globals if "__warningregistry__" in f_globals: orig = f_globals["__warningregistry__"] f_globals["__warningregistry__"] = None try: - return self._saved_warn(*args, **kwargs) + return self._saved_warn(message, category, stacklevel + 1) finally: f_globals["__warningregistry__"] = orig else: - return self._saved_warn(*args, **kwargs) + return self._saved_warn(message, category, stacklevel + 1) warnings.warn, self._saved_warn = warn, warnings.warn return self diff --git a/testing/example_scripts/perf_examples/collect_stats/.gitignore b/testing/example_scripts/perf_examples/collect_stats/.gitignore new file mode 100644 index 00000000000..1c45c2ea351 --- /dev/null +++ b/testing/example_scripts/perf_examples/collect_stats/.gitignore @@ -0,0 +1 @@ +foo_* diff --git a/testing/example_scripts/perf_examples/collect_stats/generate_folders.py b/testing/example_scripts/perf_examples/collect_stats/generate_folders.py new file mode 100644 index 00000000000..94b3f013fd8 --- /dev/null +++ b/testing/example_scripts/perf_examples/collect_stats/generate_folders.py @@ -0,0 +1,28 @@ +import argparse +import pathlib + + +HERE = pathlib.Path(__file__).parent +TEST_CONTENT = (HERE / "template_test.py").read_bytes() + +parser = argparse.ArgumentParser() +parser.add_argument("numbers", nargs="*", type=int) + + +def generate_folders(root, elements, *more_numbers): + fill_len = len(str(elements)) + if more_numbers: + for i in range(elements): + new_folder = root.joinpath(f"foo_{i:0>{fill_len}}") + new_folder.mkdir() + new_folder.joinpath("__init__.py").write_bytes(TEST_CONTENT) + generate_folders(new_folder, *more_numbers) + else: + for i in range(elements): + new_test = root.joinpath(f"test_{i:0<{fill_len}}.py") + new_test.write_bytes(TEST_CONTENT) + + +if __name__ == "__main__": + args = parser.parse_args() + generate_folders(HERE, *(args.numbers or (10, 100))) diff --git a/testing/example_scripts/perf_examples/collect_stats/template_test.py b/testing/example_scripts/perf_examples/collect_stats/template_test.py new file mode 100644 index 00000000000..064ade190a1 --- /dev/null +++ b/testing/example_scripts/perf_examples/collect_stats/template_test.py @@ -0,0 +1,2 @@ +def test_x(): + pass diff --git a/testing/test_recwarn.py b/testing/test_recwarn.py index 726f43763d6..223521a5eac 100644 --- a/testing/test_recwarn.py +++ b/testing/test_recwarn.py @@ -46,6 +46,12 @@ def test_recording(self): assert values is rec.list pytest.raises(AssertionError, "rec.pop()") + @pytest.mark.issue(4243) + def test_warn_stacklevel(self): + rec = WarningsRecorder() + with rec: + warnings.warn("test", DeprecationWarning, 2) + def test_typechecking(self): from _pytest.recwarn import WarningsChecker diff --git a/testing/test_tmpdir.py b/testing/test_tmpdir.py index d0bb3881ab9..39e5bc44386 100644 --- a/testing/test_tmpdir.py +++ b/testing/test_tmpdir.py @@ -7,6 +7,7 @@ import six import pytest +from _pytest import pathlib from _pytest.pathlib import Path @@ -287,11 +288,17 @@ def test_rmtree(self, tmp_path): rmtree(adir, force=True) assert not adir.exists() - def test_cleanup_symlink(self, tmp_path): + def test_cleanup_ignores_symlink(self, tmp_path): the_symlink = tmp_path / (self.PREFIX + "current") attempt_symlink_to(the_symlink, tmp_path / (self.PREFIX + "5")) self._do_cleanup(tmp_path) + def test_removal_accepts_lock(self, tmp_path): + folder = pathlib.make_numbered_dir(root=tmp_path, prefix=self.PREFIX) + pathlib.create_cleanup_lock(folder) + pathlib.maybe_delete_a_numbered_dir(folder) + assert folder.is_dir() + def attempt_symlink_to(path, to_path): """Try to make a symlink from "path" to "to_path", skipping in case this platform