Update to 4.3.3
This commit is contained in:
Miro Hrončok
parent
901fa6c1f2
commit
b445b57792
3 changed files with 24 additions and 56 deletions
|
|
@ -1,19 +1,19 @@
|
|||
From 996ad0a53dac123ac0d16f71147f80ac47cc86fe Mon Sep 17 00:00:00 2001
|
||||
From c58df8195d1ebe5d06ca440f91e909b3d94e834b 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 | 53 -----------------------------------------
|
||||
3 files changed, 3 insertions(+), 70 deletions(-)
|
||||
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 e8be85a..ba07bde 100644
|
||||
index c0b4541..5375902 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -47,8 +47,6 @@ optional-dependencies.docs = [
|
||||
@@ -48,8 +48,6 @@ optional-dependencies.docs = [
|
||||
]
|
||||
optional-dependencies.testing = [
|
||||
"build[virtualenv]>=0.9",
|
||||
|
|
@ -22,7 +22,7 @@ index e8be85a..ba07bde 100644
|
|||
"diff-cover>=7.3",
|
||||
"distlib>=0.3.6",
|
||||
"flaky>=3.7",
|
||||
@@ -56,7 +54,6 @@ optional-dependencies.testing = [
|
||||
@@ -57,7 +55,6 @@ optional-dependencies.testing = [
|
||||
"hatchling>=1.12.2",
|
||||
"psutil>=5.9.4",
|
||||
"pytest>=7.2",
|
||||
|
|
@ -30,7 +30,7 @@ index e8be85a..ba07bde 100644
|
|||
"pytest-mock>=3.10",
|
||||
"pytest-xdist>=3.1",
|
||||
"re-assert>=1.1",
|
||||
@@ -108,7 +105,6 @@ paths.source = [
|
||||
@@ -109,7 +106,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
|
||||
|
|
@ -80,7 +80,7 @@ index ae21125..f2f1bfb 100644
|
|||
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 c7a7fac..76d0b2c 100644
|
||||
index 91d7689..615425a 100644
|
||||
--- a/tests/test_provision.py
|
||||
+++ b/tests/test_provision.py
|
||||
@@ -12,7 +12,6 @@ from unittest import mock
|
||||
|
|
@ -91,7 +91,7 @@ index c7a7fac..76d0b2c 100644
|
|||
from filelock import FileLock
|
||||
from packaging.requirements import Requirement
|
||||
|
||||
@@ -93,23 +92,6 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
|
||||
@@ -93,21 +92,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
|
||||
return result
|
||||
|
||||
|
||||
|
|
@ -104,55 +104,20 @@ index c7a7fac..76d0b2c 100644
|
|||
- return self_index
|
||||
-
|
||||
-
|
||||
-@pytest.fixture()
|
||||
@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 test_provision_requires_nok(tox_project: ToxProjectCreator) -> None:
|
||||
ini = "[tox]\nrequires = pkg-does-not-exist\n setuptools==1\nskipsdist=true\n"
|
||||
outcome = tox_project({"tox.ini": ini}).run("c", "-e", "py")
|
||||
@@ -121,42 +103,7 @@ def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None:
|
||||
regex=True,
|
||||
)
|
||||
+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_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -> None:
|
||||
- proj = tox_project({"tox.ini": "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip"})
|
||||
- log = tmp_path / "out.log"
|
||||
-
|
||||
- # initial run
|
||||
- result_first = proj.run("r", "--result-json", str(log))
|
||||
- result_first.assert_success()
|
||||
- prov_msg = (
|
||||
- f"ROOT: will run in automatically provisioned tox, host {sys.executable} is missing"
|
||||
- f" [requires (has)]: demo-pkg-inline"
|
||||
- )
|
||||
- assert prov_msg in result_first.out
|
||||
-
|
||||
- with log.open("rt") as file_handler:
|
||||
- log_report = json.load(file_handler)
|
||||
- assert "py" in log_report["testenvs"]
|
||||
-
|
||||
- # recreate without recreating the provisioned env
|
||||
- provision_env = result_first.env_conf(".tox")["env_dir"]
|
||||
- result_recreate_no_pr = proj.run("r", "--recreate", "--no-recreate-provision")
|
||||
- result_recreate_no_pr.assert_success()
|
||||
- assert prov_msg in result_recreate_no_pr.out
|
||||
- assert f"ROOT: remove tox env folder {provision_env}" not in result_recreate_no_pr.out, result_recreate_no_pr.out
|
||||
-
|
||||
- # recreate with recreating the provisioned env
|
||||
- result_recreate = proj.run("r", "--recreate")
|
||||
- result_recreate.assert_success()
|
||||
- assert prov_msg in result_recreate.out
|
||||
- assert f"ROOT: remove tox env folder {provision_env}" in result_recreate.out, result_recreate.out
|
||||
-
|
||||
-
|
||||
@pytest.mark.integration()
|
||||
-@pytest.mark.usefixtures("_pypi_index_self")
|
||||
def test_provision_platform_check(tox_project: ToxProjectCreator) -> None:
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
%undefine _py3_shebang_s
|
||||
|
||||
Name: python-tox
|
||||
Version: 4.3.2
|
||||
Version: 4.3.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Virtualenv-based automation of test activities
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ License: MIT
|
|||
URL: https://tox.readthedocs.io/
|
||||
Source0: %{pypi_source tox}
|
||||
|
||||
# Remove dependency on devpi-process and 1 test that cannot work without it.
|
||||
# Remove dependency on devpi-process.
|
||||
# Remove coverage-related dependencies.
|
||||
# Adjust virtualenv environment variables to make it work with our patched virtualenv.
|
||||
Patch: fix-tests.patch
|
||||
|
|
@ -157,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot"
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 16 2023 Miro Hrončok <mhroncok@redhat.com> - 4.3.3-1
|
||||
- Update to 4.3.3 (rhbz#2161429)
|
||||
|
||||
* Mon Jan 16 2023 Miro Hrončok <mhroncok@redhat.com> - 4.3.2-1
|
||||
- Update to 4.3.2 (rhbz#2161388)
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (tox-4.3.2.tar.gz) = 55cf7c7ae602063ffc6205acd06a4ff675c356fceae17259f4f34c4775a818e49ad169b935339db0560d9d62fa5529c6ae2ee3f63c0bd3cfb88d943805eac4c4
|
||||
SHA512 (tox-4.3.3.tar.gz) = d835ecceb0d218d9e724a85d1d5ca0a060ee6ff4728777c76343e47faaa5178a378f64adeda30d272b0a971b4bfe1fd4e49b3dfeb24cebd91607529d62e5e72e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue