[gentoo-commits] repo/gentoo:master commit in: dev-python/pyftpdlib/

[Louis Sautier]

commit:     c950569c7258c60c8ba69a86f423e596750ccf4a
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 21:44:11 2018 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 21:44:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c950569c

dev-python/pyftpdlib: skip failing tests for v1.5.4

Closes: https://bugs.gentoo.org/659108
Closes: https://bugs.gentoo.org/636410
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index 8086ddd2bcd..14ef11ae7fe 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pysendfile[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
@@ -47,7 +48,15 @@ python_compile_all() {
 }
 
 python_test() {
-	"${EPYTHON}" ${PN}/test/runner.py || die "Tests failed with ${EPYTHON}"
+	# Skip tests which sometimes fail:
+	# https://github.com/giampaolo/pyftpdlib/issues/470
+	# https://github.com/giampaolo/pyftpdlib/issues/471
+	py.test --ignore ${PN}/test/test_misc.py -k \
+		"not (test_idle_data_timeout2 or test_on_incomplete_file_received)" \
+		|| die "Tests failed with ${EPYTHON}"
+	# These tests fail when passing additional options to py.test
+	# so we need to run them separately
+	py.test ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {