diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-python/pytest-mock/files | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'dev-python/pytest-mock/files')
-rw-r--r-- | dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch | 36 | ||||
-rw-r--r-- | dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch | 39 |
2 files changed, 75 insertions, 0 deletions
diff --git a/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch b/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch new file mode 100644 index 000000000000..bea2bb14b15d --- /dev/null +++ b/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch @@ -0,0 +1,36 @@ +From 09477f0d28f3b6b9fa36b861d701c9d1a937e553 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 d1635f5..e85f392 100644 +--- a/tests/test_pytest_mock.py ++++ b/tests/test_pytest_mock.py +@@ -801,7 +801,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} if sys.version_info[0] >= 3 else {} + assert compileall.compile_file(str(py_fn), **kwargs) +@@ -811,4 +811,4 @@ 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*") +-- +2.26.2 + 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 new file mode 100644 index 000000000000..4851afe9d1ba --- /dev/null +++ b/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch @@ -0,0 +1,39 @@ +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 + |