diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-11-03 06:47:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-03 06:47:15 +0000 |
| commit | fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch) | |
| tree | f834bdc9a67923ce75297c09d00d1e7b90791d26 /dev-python/pytest-xdist | |
| parent | 162945d2a91899b637bbb9e163b406350de12906 (diff) | |
gentoo resync : 03.11.2021
Diffstat (limited to 'dev-python/pytest-xdist')
| -rw-r--r-- | dev-python/pytest-xdist/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch | 31 |
2 files changed, 0 insertions, 32 deletions
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest index 44fdc80e0a77..9283ea41f26b 100644 --- a/dev-python/pytest-xdist/Manifest +++ b/dev-python/pytest-xdist/Manifest @@ -1,4 +1,3 @@ -AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02 DIST pytest-xdist-2.4.0.tar.gz 67199 BLAKE2B bba867bfbd1e161ada2157fdb5a10f929fefed959b64afef74453206d91e5014abaaa1363ac9adbc89ed476a841607f6830781817842b9be119a09bda7278b91 SHA512 2d2da6aaa8da07a28d7c6c81a0044493b7d0d1a68921e7ec94cfd2f698eaa5594b6da4d82524804637d5cc061fbe19034f3c65a07ee5a0c906170856edc3d383 EBUILD pytest-xdist-2.4.0.ebuild 1158 BLAKE2B fd617b12aa19dec1f7f85bce83025ab6c0ca8d913e8a8cfd1a3247c7cedd4cbb4a0d9aa97d6f8e497379578d0e2e7dc322b96d5db2c4373844a195fdfee4be3b SHA512 e37fb1565e462690e5cecb8c70fe4013fc8033d071dd1c83ec9f11215b2ea0508911c3e284907126c80496d4a1985077cf710c827bee1b1e640fd004038e85e0 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe 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 deleted file mode 100644 index 2c911601b070..000000000000 --- a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 082beb2ce0fe1f338311d85e656b962df8a16ce1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 15 Dec 2020 11:38:53 +0100 -Subject: [PATCH] Disable pytest-services plugin in test to avoid worker_id - conflict - -Pass "-p no:pytest-services" in test_worker_id_fixture() to ensure -that the presence (and implicit loading) of pytest-services will not -cause the test to fail via overriding worker name. - -Fixes #611 ---- - testing/acceptance_test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py -index c273bfa..3bea8fc 100644 ---- a/testing/acceptance_test.py -+++ b/testing/acceptance_test.py -@@ -1025,7 +1025,7 @@ def test_worker_id_fixture(testdir, n): - f.write(worker_id) - """ - ) -- result = testdir.runpytest(f, "-n%d" % n) -+ result = testdir.runpytest(f, "-n%d" % n, "-p", "no:pytest-services") - result.stdout.fnmatch_lines("* 2 passed in *") - worker_ids = set() - for fname in glob.glob(str(testdir.tmpdir.join("*.txt"))): --- -2.29.2 - |