From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sun, 26 Apr 2020 22:37:28 +0000 (+0200)
Subject: dev-python/twisted: disable more conch tests
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1234300c50e8a55e922e3df60013ffe162bfeaea;p=gentoo.git

dev-python/twisted: disable more conch tests

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---

diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 074f0cee66f7..b10b1aa01a56 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -89,8 +89,9 @@ python_prepare_all() {
 	# Conch doesn't work with latest >=OpenSSH 7.6
 	#   - https://twistedmatrix.com/trac/ticket/9311
 	#   - https://twistedmatrix.com/trac/ticket/9515
-	rm src/twisted/conch/test/test_conch.py || die "rm src/twisted/conch/test/test_conch.py FAILED"
-	rm src/twisted/conch/test/test_cftp.py || die "rm src/twisted/conch/test/test_cftp.py FAILED"
+	rm src/twisted/conch/test/test_ckeygen.py || die
+	rm src/twisted/conch/test/test_conch.py || die
+	rm src/twisted/conch/test/test_cftp.py || die
 
 	# puts system in EMFILE state, then the exception handler may fail
 	# trying to open more files due to some gi magic
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 3294057943d2..c35ab596c1cf 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -93,8 +93,9 @@ python_prepare_all() {
 	# Conch doesn't work with latest >=OpenSSH 7.6
 	#   - https://twistedmatrix.com/trac/ticket/9311
 	#   - https://twistedmatrix.com/trac/ticket/9515
-	rm src/twisted/conch/test/test_conch.py || die "rm src/twisted/conch/test/test_conch.py FAILED"
-	rm src/twisted/conch/test/test_cftp.py || die "rm src/twisted/conch/test/test_cftp.py FAILED"
+	rm src/twisted/conch/test/test_ckeygen.py || die
+	rm src/twisted/conch/test/test_conch.py || die
+	rm src/twisted/conch/test/test_cftp.py || die
 
 	# puts system in EMFILE state, then the exception handler may fail
 	# trying to open more files due to some gi magic