dev-python/eventlet: Increase test timeouts

Closes: https://bugs.gentoo.org/781905
Signed-off-by: Michał Górny <mgorny@gentoo.org>

2 files changed, 43 insertions, 6 deletions

diff --git a/dev-python/eventlet/eventlet-0.30.2-r1.ebuild b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
index 89b99f95ed12..f8d57c28dd02 100644
--- a/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
@@ -29,8 +29,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.25.1-tests.patch"
-	"${FILESDIR}/${PN}-0.30.0-tests-socket.patch"
+	"${FILESDIR}/eventlet-0.25.1-tests.patch"
+	"${FILESDIR}/eventlet-0.30.0-tests-socket.patch"
+	"${FILESDIR}/eventlet-0.30.2-test-timeout.patch"
 )
 
 distutils_enable_sphinx doc
@@ -45,16 +46,13 @@ python_prepare_all() {
 		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
 	fi
 
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	unset PYTHONPATH
 	export TMPDIR="${T}"
-	nosetests -v || die
+	nosetests -v -x || die
 }
 
 python_install_all() {
diff --git a/dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch b/dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch
new file mode 100644
index 000000000000..d31b3738bc16
--- /dev/null
+++ b/dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch
@@ -0,0 +1,39 @@
+From 0b8fd069386354d2d7e5464ce0b0d5b7d1795376 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 11 Apr 2021 12:20:09 +0200
+Subject: [PATCH] Force test timeouts to 60 s
+
+The upstream test timeouts are far too low for a busy system, and there
+is no point in pursuing such low values anyway.  Force 60 s that should
+be reasonably safe for our test runs.
+---
+ tests/__init__.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/__init__.py b/tests/__init__.py
+index 82cd247..3a943c4 100644
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -170,8 +170,8 @@ class LimitedTestCase(unittest.TestCase):
+ 
+     def setUp(self):
+         self.previous_alarm = None
+-        self.timer = eventlet.Timeout(self.TEST_TIMEOUT,
+-                                      TestIsTakingTooLong(self.TEST_TIMEOUT))
++        self.timer = eventlet.Timeout(60,
++                                      TestIsTakingTooLong(60))
+ 
+     def reset_timeout(self, new_timeout):
+         """Changes the timeout duration; only has effect during one test.
+@@ -350,7 +350,7 @@ def run_python(path, env=None, args=None, timeout=None, pythonpath_extend=None,
+         stdout=subprocess.PIPE,
+     )
+     if timeout is None:
+-        timeout = 10
++        timeout = 60
+     try:
+         output, _ = p.communicate(timeout=timeout)
+     except subprocess.TimeoutExpired:
+-- 
+2.31.1
+