From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 11 Aug 2021 07:02:28 +0100
Subject: gentoo resync : 11.08.2021

---
 dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild')

diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
index a063b7e0f3b6..f6e04c744b72 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -15,24 +15,24 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples ssl test"
-RESTRICT="!test? ( test )"
+IUSE="examples ssl"
 
 RDEPEND="
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 "
 BDEPEND="
 	test? (
-		${RDEPEND}
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
+distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 
 python_test() {
+	cd "${BUILD_DIR}"/lib || die
+
 	# These tests fail when passing additional options to pytest
 	# so we need to run them separately and not pass any args to pytest
 	pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
@@ -40,16 +40,9 @@ python_test() {
 	local skipped_tests=(
 		# Those tests are run separately
 		pyftpdlib/test/test_misc.py
-		# https://github.com/giampaolo/pyftpdlib/issues/470
-		# https://bugs.gentoo.org/659108
-		pyftpdlib/test/test_functional_ssl.py::TestTimeouts::test_idle_data_timeout2
-		pyftpdlib/test/test_functional_ssl.py::TestTimeoutsTLSMixin::test_idle_data_timeout2
 		# https://github.com/giampaolo/pyftpdlib/issues/471
 		# https://bugs.gentoo.org/636410
 		pyftpdlib/test/test_functional.py::TestCallbacks::test_on_incomplete_file_received
-		# https://github.com/giampaolo/pyftpdlib/issues/466
-		# https://bugs.gentoo.org/659786
-		pyftpdlib/test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
 		# https://github.com/giampaolo/pyftpdlib/issues/512
 		# https://bugs.gentoo.org/701146
 		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_rest_on_stor
@@ -74,7 +67,10 @@ python_test() {
 		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptionsTLSMixin::test_masquerade_address_map
 	)
 	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	TZ=UTC+1 epytest ${skipped_tests[@]/#/--deselect }
+	local -x TZ=UTC+1
+	# Skips some shoddy tests plus increases timeouts
+	local -x TRAVIS=1
+	epytest -p no:xvfb ${skipped_tests[@]/#/--deselect }
 }
 
 python_install_all() {
-- 
cgit v1.2.3