diff --git a/.azure-pipelines/steps/run-tests-linux.yml b/.azure-pipelines/steps/run-tests-linux.yml index 95614e7e..73eaba8f 100644 --- a/.azure-pipelines/steps/run-tests-linux.yml +++ b/.azure-pipelines/steps/run-tests-linux.yml @@ -21,7 +21,7 @@ steps: # Fix Git SSL errors echo "Using pipenv python version: $(PIPENV_DEFAULT_PYTHON_VERSION)" git submodule sync && git submodule update --init --recursive - pipenv run pytest -v -n auto --junitxml=junit/test-results.xml tests + pipenv run pytest -v -n auto --durations=10 --junitxml=junit/test-results.xml tests displayName: Run integration tests env: PYTHONWARNINGS: ignore:DEPRECATION diff --git a/.azure-pipelines/steps/run-tests-windows.yml b/.azure-pipelines/steps/run-tests-windows.yml index 598fb0ab..b37cea2d 100644 --- a/.azure-pipelines/steps/run-tests-windows.yml +++ b/.azure-pipelines/steps/run-tests-windows.yml @@ -47,7 +47,7 @@ steps: git submodule sync git submodule update --init --recursive $venv = (pipenv --venv)[0] - & $venv/Scripts/pytest.exe -ra -n auto -v --junit-xml=junit/test-results.xml tests/ + & $venv/Scripts/pytest.exe -ra -n auto -v --durations=10 --junit-xml=junit/test-results.xml tests/ failOnStderr: false displayName: Run integration tests env: diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 0d544e30..f34cb4a9 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -1,4 +1,5 @@ import errno +import functools import json import logging import os @@ -449,7 +450,7 @@ def pip_src_dir(request, vistir_tmpdir): @pytest.fixture() -def PipenvInstance(pip_src_dir, monkeypatch, pypi): +def PipenvInstance(pip_src_dir, monkeypatch, pypi, tmp_path): with temp_environ(), monkeypatch.context() as m: m.setattr(shutil, "rmtree", _rmtree_func) original_umask = os.umask(0o007) @@ -463,7 +464,7 @@ def PipenvInstance(pip_src_dir, monkeypatch, pypi): warnings.simplefilter("ignore", category=ResourceWarning) warnings.filterwarnings("ignore", category=ResourceWarning, message="unclosed.*") try: - yield _PipenvInstance + yield functools.partial(_PipenvInstance, path=tmp_path, pypi=pypi) finally: os.umask(original_umask) diff --git a/tests/integration/test_uninstall.py b/tests/integration/test_uninstall.py index 25dd7f5e..14883af2 100644 --- a/tests/integration/test_uninstall.py +++ b/tests/integration/test_uninstall.py @@ -193,4 +193,4 @@ def test_uninstall_missing_parameters(PipenvInstance): c = p.pipenv("uninstall") assert c.returncode != 0 - assert "No package provided!" in c.stderr + assert "No package provided!" in str(c.exception)