| 1 |
commit: a1a30ee0c05d7f65db7124843afb2a7232d42540 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Mon Nov 1 16:25:50 2021 +0000 |
| 4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 1 17:34:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1a30ee0 |
| 7 |
|
| 8 |
dev-python/pytest-xdist: remove unused patch(es) |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/22785 |
| 13 |
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> |
| 14 |
|
| 15 |
.../pytest-xdist-2.2.0-services-conflict.patch | 31 ---------------------- |
| 16 |
1 file changed, 31 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 2c911601b07..00000000000 |
| 21 |
--- a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,31 +0,0 @@ |
| 24 |
-From 082beb2ce0fe1f338311d85e656b962df8a16ce1 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 26 |
-Date: Tue, 15 Dec 2020 11:38:53 +0100 |
| 27 |
-Subject: [PATCH] Disable pytest-services plugin in test to avoid worker_id |
| 28 |
- conflict |
| 29 |
- |
| 30 |
-Pass "-p no:pytest-services" in test_worker_id_fixture() to ensure |
| 31 |
-that the presence (and implicit loading) of pytest-services will not |
| 32 |
-cause the test to fail via overriding worker name. |
| 33 |
- |
| 34 |
-Fixes #611 |
| 35 |
---- |
| 36 |
- testing/acceptance_test.py | 2 +- |
| 37 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 38 |
- |
| 39 |
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py |
| 40 |
-index c273bfa..3bea8fc 100644 |
| 41 |
---- a/testing/acceptance_test.py |
| 42 |
-+++ b/testing/acceptance_test.py |
| 43 |
-@@ -1025,7 +1025,7 @@ def test_worker_id_fixture(testdir, n): |
| 44 |
- f.write(worker_id) |
| 45 |
- """ |
| 46 |
- ) |
| 47 |
-- result = testdir.runpytest(f, "-n%d" % n) |
| 48 |
-+ result = testdir.runpytest(f, "-n%d" % n, "-p", "no:pytest-services") |
| 49 |
- result.stdout.fnmatch_lines("* 2 passed in *") |
| 50 |
- worker_ids = set() |
| 51 |
- for fname in glob.glob(str(testdir.tmpdir.join("*.txt"))): |
| 52 |
--- |
| 53 |
-2.29.2 |
| 54 |
- |
Archives