summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2020-08-28 18:58:56 +0200
committerDavid Seifert <soap@gentoo.org>2020-09-12 11:54:31 +0200
commit84d1d4fea498af3ea22d47484a68f45950a30e27 (patch)
tree86b827f2192bd3fa52f1546690d8a774fd1a7959 /dev-python/pytest-mock
parentdev-python/pyqtgraph: remove unused patch (diff)
downloadgentoo-84d1d4fea498af3ea22d47484a68f45950a30e27.tar.gz
gentoo-84d1d4fea498af3ea22d47484a68f45950a30e27.tar.bz2
gentoo-84d1d4fea498af3ea22d47484a68f45950a30e27.zip
dev-python/pytest-mock: remove unused patch
Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-python/pytest-mock')
-rw-r--r--dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch b/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch
deleted file mode 100644
index 4851afe9d1ba..000000000000
--- a/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1ef3d6111a8e4f32dfa9a2c311b6996afd9e98a5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 May 2020 10:56:27 +0200
-Subject: [PATCH] Permit warnings in *_stale_pyc tests
-
-The *_stale_pyc test is repeatedly failing on production systems
-due to additional pytest plugins being installed and triggering
-PytestAssertRewriteWarnings. This causes 'passed *' string not to match
-because of the ',' after 'passed'. Match just 'passed*' instead
-to solve this.
----
- tests/test_pytest_mock.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py
-index 73509a4..5e1a502 100644
---- a/tests/test_pytest_mock.py
-+++ b/tests/test_pytest_mock.py
-@@ -809,7 +809,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
- """
- )
- result = testdir.runpytest()
-- result.stdout.fnmatch_lines("* 1 passed *")
-+ result.stdout.fnmatch_lines("* 1 passed*")
-
- kwargs = {"legacy": True}
- assert compileall.compile_file(str(py_fn), **kwargs)
-@@ -819,7 +819,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
-
- py_fn.remove()
- result = testdir.runpytest()
-- result.stdout.fnmatch_lines("* 1 passed *")
-+ result.stdout.fnmatch_lines("* 1 passed*")
-
-
- def test_used_with_class_scope(testdir):
---
-2.26.2
-