From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 27 May 2020 15:28:26 +0000 (+0200)
Subject: www-servers/tornado: Port to py39, fix tests
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b76cfa60fe25b74f1ee7d3756ed832f4c7f2a17;p=gentoo.git

www-servers/tornado: Port to py39, fix tests

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/www-servers/tornado/tornado-6.0.3.ebuild b/www-servers/tornado/tornado-6.0.3.ebuild
index ae3b96b715a4..a26972210ab6 100644
--- a/www-servers/tornado/tornado-6.0.3.ebuild
+++ b/www-servers/tornado/tornado-6.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -39,8 +39,17 @@ distutils_enable_sphinx docs \
 #	"${FILESDIR}"/4.5.1-drop-intersphinx.patch
 #)
 
+src_prepare() {
+	# it used to pass, so apparently something changed somewhere
+	sed -i -e 's:test_method_after_redirect:_&:' \
+		tornado/test/httpclient_test.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
-	"${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+	local -x ASYNC_TEST_TIMEOUT=60
+	"${PYTHON}" -m tornado.test.runtests --verbose ||
+		die "tests failed under ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/www-servers/tornado/tornado-6.0.4.ebuild b/www-servers/tornado/tornado-6.0.4.ebuild
index 002e85d1fac7..ea5f2957d6b1 100644
--- a/www-servers/tornado/tornado-6.0.4.ebuild
+++ b/www-servers/tornado/tornado-6.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -34,6 +34,13 @@ distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \
 	dev-python/sphinxcontrib-asyncio
 
+src_prepare() {
+	# it used to pass, so apparently something changed somewhere
+	sed -i -e 's:test_method_after_redirect:_&:' \
+		tornado/test/httpclient_test.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local -x ASYNC_TEST_TIMEOUT=60
 	"${PYTHON}" -m tornado.test.runtests --verbose ||