commit: 2b5ff91101ffed5aa0667b8f1cd0e288c894935f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 1 22:24:37 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 22:29:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5ff911
dev-python/pytest-timeout: Fix testing without pytest-cov
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/pytest-timeout-1.4.2-optional-cov.patch | 27 ++++++++++++++++++++++
.../pytest-timeout/pytest-timeout-1.4.1-r1.ebuild | 4 ++++
.../pytest-timeout/pytest-timeout-1.4.2.ebuild | 4 ++++
3 files changed, 35 insertions(+)
diff --git
a/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
new file mode 100644
index 00000000000..424cfa6c57d
--- /dev/null
+++ b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
@@ -0,0 +1,27 @@
+From 65a79fe8ceb52d7ae978f4a2ecc47a1fd34fda2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org>
+Date: Sun, 2 Aug 2020 00:11:53 +0200
+Subject: [PATCH] Skip test_cov if pytest-cov is not installed
+
+Skip test_cov gracefully if pytest_cov module can't be imported.
+This would help us since we're removing py2 support from pytest-cov
+but still need it for pytest-timeout.
+---
+ test_pytest_timeout.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
+index 16302d7..69707b4 100644
+--- a/test_pytest_timeout.py
++++ b/test_pytest_timeout.py
+@@ -77,6 +77,7 @@ def test_thread(testdir):
+ )
+ def test_cov(testdir):
+ # This test requires pytest-cov
++ pytest.importorskip("pytest_cov")
+ testdir.makepyfile(
+ """
+ import time
+--
+2.28.0
+
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
b/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
index 56fd0feec5d..2821063d308 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
@@ -28,6 +28,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
+)
+
python_test() {
distutils_install_for_testing
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
index 56fd0feec5d..2821063d308 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
@@ -28,6 +28,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
+)
+
python_test() {
distutils_install_for_testing
