From eb6cd0a5fe1734c5eee78b9889ba7a07fdeb2111 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Tue, 10 Jan 2023 08:34:25 +0100
Subject: [PATCH] fix tests

---
 pyproject.toml          |  4 ----
 src/tox/pytest.py       | 16 +++-------------
 tests/test_provision.py | 18 ++----------------
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 19ee5ec..b806958 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -73,8 +73,6 @@ optional-dependencies.docs = [
 ]
 optional-dependencies.testing = [
   "build[virtualenv]>=0.10",
-  "covdefaults>=2.3",
-  "devpi-process>=0.3",
   "diff-cover>=7.5",
   "distlib>=0.3.6",
   "flaky>=3.7",
@@ -82,7 +80,6 @@ optional-dependencies.testing = [
   "hatchling>=1.14",
   "psutil>=5.9.4",
   "pytest>=7.2.2",
-  "pytest-cov>=4",
   "pytest-mock>=3.10",
   "pytest-xdist>=3.2.1",
   "re-assert>=1.1",
@@ -120,7 +117,6 @@ paths.source = [
 report.fail_under = 88
 report.omit = ["src/tox/config/cli/for_docs.py", "tests/execute/local_subprocess/bad_process.py", "tests/type_check/*"]
 run.parallel = true
-run.plugins = ["covdefaults"]
 
 [tool.isort]
 known_first_party = ["tox", "tests"]
diff --git a/src/tox/pytest.py b/src/tox/pytest.py
index 0bc9905..65701b5 100644
--- a/src/tox/pytest.py
+++ b/src/tox/pytest.py
@@ -26,7 +26,6 @@ from _pytest.logging import LogCaptureFixture
 from _pytest.monkeypatch import MonkeyPatch
 from _pytest.python import Function
 from _pytest.tmpdir import TempPathFactory
-from devpi_process import IndexServer
 from pytest_mock import MockerFixture
 from virtualenv.info import fs_supports_symlink
 
@@ -286,9 +285,9 @@ class ToxProject:
                 m.setattr(sys, "argv", [sys.executable, "-m", "tox"] + list(args))
                 m.setenv("VIRTUALENV_SYMLINK_APP_DATA", "1")
                 m.setenv("VIRTUALENV_SYMLINKS", "1")
-                m.setenv("VIRTUALENV_PIP", "embed")
-                m.setenv("VIRTUALENV_WHEEL", "embed")
-                m.setenv("VIRTUALENV_SETUPTOOLS", "embed")
+                m.setenv("VIRTUALENV_PIP", "bundle")
+                m.setenv("VIRTUALENV_WHEEL", "bundle")
+                m.setenv("VIRTUALENV_SETUPTOOLS", "bundle")
                 try:
                     tox_run(args)
                 except SystemExit as exception:
@@ -472,15 +471,6 @@ def enable_pypi_server(monkeypatch: MonkeyPatch, url: str | None) -> None:
     monkeypatch.setenv("PIP_TIMEOUT", str(2))
 
 
-@pytest.fixture(scope="session")
-def pypi_server(tmp_path_factory: TempPathFactory) -> Iterator[IndexServer]:
-    # takes around 2.5s
-    path = tmp_path_factory.mktemp("pypi")
-    with IndexServer(path) as server:
-        server.create_index("empty", "volatile=False")
-        yield server
-
-
 @pytest.fixture(scope="session")
 def _invalid_index_fake_port() -> int:  # noqa: PT005
     with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as socket_handler:
diff --git a/tests/test_provision.py b/tests/test_provision.py
index 290e48d..475d7f4 100644
--- a/tests/test_provision.py
+++ b/tests/test_provision.py
@@ -12,7 +12,6 @@ from unittest import mock
 from zipfile import ZipFile
 
 import pytest
-from devpi_process import Index, IndexServer
 from filelock import FileLock
 from packaging.requirements import Requirement
 
@@ -93,21 +92,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
         return result
 
 
-@pytest.fixture(scope="session")
-def pypi_index_self(pypi_server: IndexServer, tox_wheels: list[Path], demo_pkg_inline_wheel: Path) -> Index:
-    with elapsed("start devpi and create index"):  # takes around 1s
-        self_index = pypi_server.create_index("self", "volatile=False")
-    with elapsed("upload tox and its wheels to devpi"):  # takes around 3.2s on build
-        self_index.upload(*tox_wheels, demo_pkg_inline_wheel)
-    return self_index
-
-
 @pytest.fixture()
-def _pypi_index_self(pypi_index_self: Index, monkeypatch: MonkeyPatch) -> None:
-    pypi_index_self.use()
-    monkeypatch.setenv("PIP_INDEX_URL", pypi_index_self.url)
-    monkeypatch.setenv("PIP_RETRIES", str(2))
-    monkeypatch.setenv("PIP_TIMEOUT", str(5))
+def _pypi_index_self():
+    pytest.skip("needs devpi-process")
 
 
 def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None:
@@ -156,7 +143,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
 
 
 @pytest.mark.integration()
-@pytest.mark.usefixtures("_pypi_index_self")
 def test_provision_platform_check(tox_project: ToxProjectCreator) -> None:
     ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform"
     proj = tox_project({"tox.ini": ini})
-- 
2.39.2