diff --git a/.travis.yml b/.travis.yml index 49c94b47e..00abca0b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,11 +47,6 @@ jobs: env: TOXENV=py37 before_install: - brew update - # remove c++ include files because upgrading python as of 2018-10-23, also - # attempts to upgrade gcc, and it fails because the include files already - # exist. removing the include files is one of the solutions recommended by brew - # this workaround might not be necessary in the future - - rm '/usr/local/include/c++' - brew upgrade python - brew unlink python - brew link python diff --git a/AUTHORS b/AUTHORS index dabeb1c06..777eda324 100644 --- a/AUTHORS +++ b/AUTHORS @@ -76,6 +76,7 @@ Endre Galaczi Eric Hunsberger Eric Siegerman Erik M. Bray +Fabien Zarifian Fabio Zadrozny Feng Ma Florian Bruhin diff --git a/changelog/4304.bugfix.rst b/changelog/4304.bugfix.rst new file mode 100644 index 000000000..7d4dc033e --- /dev/null +++ b/changelog/4304.bugfix.rst @@ -0,0 +1 @@ +Block the ``stepwise`` plugin if ``cacheprovider`` is also blocked, as one depends on the other. diff --git a/changelog/4329.bugfix.rst b/changelog/4329.bugfix.rst new file mode 100644 index 000000000..6acfe7e61 --- /dev/null +++ b/changelog/4329.bugfix.rst @@ -0,0 +1 @@ +Fix TypeError in report_collect with _collect_report_last_write. diff --git a/doc/en/usage.rst b/doc/en/usage.rst index cc118fad8..08682d614 100644 --- a/doc/en/usage.rst +++ b/doc/en/usage.rst @@ -255,8 +255,8 @@ Pytest supports the use of ``breakpoint()`` with the following behaviours: - When ``breakpoint()`` is called and ``PYTHONBREAKPOINT`` is set to the default value, pytest will use the custom internal PDB trace UI instead of the system default ``Pdb``. - When tests are complete, the system will default back to the system ``Pdb`` trace UI. - - If ``--pdb`` is called on execution of pytest, the custom internal Pdb trace UI is used on both ``breakpoint()`` and failed tests/unhandled exceptions. - - If ``--pdbcls`` is used, the custom class debugger will be executed when a test fails (as expected within existing behaviour), but also when ``breakpoint()`` is called from within a test, the custom class debugger will be instantiated. + - With ``--pdb`` passed to pytest, the custom internal Pdb trace UI is used with both ``breakpoint()`` and failed tests/unhandled exceptions. + - ``--pdbcls`` can be used to specify a custom debugger class. .. _durations: diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py index d3bdef1ec..60b455bb3 100644 --- a/src/_pytest/config/__init__.py +++ b/src/_pytest/config/__init__.py @@ -477,6 +477,11 @@ class PytestPluginManager(PluginManager): def consider_pluginarg(self, arg): if arg.startswith("no:"): name = arg[3:] + # PR #4304 : remove stepwise if cacheprovider is blocked + if name == "cacheprovider": + self.set_blocked("stepwise") + self.set_blocked("pytest_stepwise") + self.set_blocked(name) if not name.startswith("pytest_"): self.set_blocked("pytest_" + name) diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py index 73aed8371..124b611db 100644 --- a/src/_pytest/fixtures.py +++ b/src/_pytest/fixtures.py @@ -927,7 +927,7 @@ class FixtureDef(object): return hook.pytest_fixture_setup(fixturedef=self, request=request) def __repr__(self): - return "" % ( + return "" % ( self.argname, self.scope, self.baseid, diff --git a/src/_pytest/main.py b/src/_pytest/main.py index 9674f869b..0a4cbab0e 100644 --- a/src/_pytest/main.py +++ b/src/_pytest/main.py @@ -279,7 +279,7 @@ def pytest_ignore_collect(path, config): return True allow_in_venv = config.getoption("collect_in_virtualenv") - if _in_venv(path) and not allow_in_venv: + if not allow_in_venv and _in_venv(path): return True return False @@ -511,9 +511,9 @@ class Session(nodes.FSCollector): # No point in finding packages when collecting doctests if not self.config.option.doctestmodules: pm = self.config.pluginmanager - for parent in argpath.parts(): + for parent in reversed(argpath.parts()): if pm._confcutdir and pm._confcutdir.relto(parent): - continue + break if parent.isdir(): pkginit = parent.join("__init__.py") diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py index ca24ff1b0..8d5a6b141 100644 --- a/src/_pytest/pytester.py +++ b/src/_pytest/pytester.py @@ -1160,11 +1160,11 @@ class Testdir(object): def runpytest_subprocess(self, *args, **kwargs): """Run pytest as a subprocess with given arguments. - Any plugins added to the :py:attr:`plugins` list will added using the - ``-p`` command line option. Additionally ``--basetemp`` is used put + Any plugins added to the :py:attr:`plugins` list will be added using the + ``-p`` command line option. Additionally ``--basetemp`` is used to put any temporary files and directories in a numbered directory prefixed - with "runpytest-" so they do not conflict with the normal numbered - pytest location for temporary files and directories. + with "runpytest-" to not conflict with the normal numbered pytest + location for temporary files and directories. :param args: the sequence of arguments to pass to the pytest subprocess :param timeout: the period in seconds after which to timeout and raise diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py index a00dc0842..dde2750be 100644 --- a/src/_pytest/terminal.py +++ b/src/_pytest/terminal.py @@ -497,7 +497,10 @@ class TerminalReporter(object): if not final: # Only write "collecting" report every 0.5s. t = time.time() - if self._collect_report_last_write > t - 0.5: + if ( + self._collect_report_last_write is not None + and self._collect_report_last_write > t - 0.5 + ): return self._collect_report_last_write = t diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 8917de6b2..19d7946cf 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -27,8 +27,9 @@ class TestGeneralUsage(object): def test_config_error(self, testdir): testdir.copy_example("conftest_usageerror/conftest.py") result = testdir.runpytest(testdir.tmpdir) - assert result.ret != 0 + assert result.ret == EXIT_USAGEERROR result.stderr.fnmatch_lines(["*ERROR: hello"]) + result.stdout.fnmatch_lines(["*pytest_unconfigure_called"]) def test_root_conftest_syntax_error(self, testdir): testdir.makepyfile(conftest="raise SyntaxError\n") diff --git a/testing/example_scripts/conftest_usageerror/conftest.py b/testing/example_scripts/conftest_usageerror/conftest.py index 7d0d39d3a..8973e4252 100644 --- a/testing/example_scripts/conftest_usageerror/conftest.py +++ b/testing/example_scripts/conftest_usageerror/conftest.py @@ -2,3 +2,7 @@ def pytest_configure(config): import pytest raise pytest.UsageError("hello") + + +def pytest_unconfigure(config): + print("pytest_unconfigure_called") diff --git a/testing/logging/test_fixture.py b/testing/logging/test_fixture.py index 7a815cf12..ff772e7ec 100644 --- a/testing/logging/test_fixture.py +++ b/testing/logging/test_fixture.py @@ -136,5 +136,5 @@ def test_caplog_captures_for_all_stages(caplog, logging_during_setup_and_teardow assert [x.message for x in caplog.get_records("setup")] == ["a_setup_log"] - # This reachers into private API, don't use this type of thing in real tests! + # This reaches into private API, don't use this type of thing in real tests! assert set(caplog._item.catch_log_handlers.keys()) == {"setup", "call"} diff --git a/testing/test_config.py b/testing/test_config.py index 82466df1f..1be266387 100644 --- a/testing/test_config.py +++ b/testing/test_config.py @@ -874,7 +874,7 @@ class TestRootdir(object): assert inifile == inifile @pytest.mark.parametrize("name", "setup.cfg tox.ini".split()) - def test_pytestini_overides_empty_other(self, tmpdir, name): + def test_pytestini_overrides_empty_other(self, tmpdir, name): inifile = tmpdir.ensure("pytest.ini") a = tmpdir.mkdir("a") a.ensure(name) diff --git a/testing/test_modimport.py b/testing/test_modimport.py index 64e9d7261..cb5f5ccd3 100644 --- a/testing/test_modimport.py +++ b/testing/test_modimport.py @@ -19,13 +19,19 @@ def test_fileimport(modfile): # without needing the pytest namespace being set # this is critical for the initialization of xdist - res = subprocess.call( + p = subprocess.Popen( [ sys.executable, "-c", "import sys, py; py.path.local(sys.argv[1]).pyimport()", modfile.strpath, - ] + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, ) - if res: - pytest.fail("command result %s" % res) + (out, err) = p.communicate() + if p.returncode != 0: + pytest.fail( + "importing %s failed (exitcode %d): out=%r, err=%r" + % (modfile, p.returncode, out, err) + ) diff --git a/testing/test_pluginmanager.py b/testing/test_pluginmanager.py index 0bee415f2..8e35290b7 100644 --- a/testing/test_pluginmanager.py +++ b/testing/test_pluginmanager.py @@ -380,3 +380,21 @@ class TestPytestPluginManagerBootstrapming(object): pytestpm.consider_preparse(["xyz", "-p", "no:abc"]) l2 = pytestpm.get_plugins() assert 42 not in l2 + + def test_plugin_prevent_register_stepwise_on_cacheprovider_unregister( + self, pytestpm + ): + """ From PR #4304 : The only way to unregister a module is documented at + the end of https://docs.pytest.org/en/latest/plugins.html. + + When unregister cacheprovider, then unregister stepwise too + """ + pytestpm.register(42, name="cacheprovider") + pytestpm.register(43, name="stepwise") + l1 = pytestpm.get_plugins() + assert 42 in l1 + assert 43 in l1 + pytestpm.consider_preparse(["xyz", "-p", "no:cacheprovider"]) + l2 = pytestpm.get_plugins() + assert 42 not in l2 + assert 43 not in l2