summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/twisted/twisted-19.10.0.ebuild6
-rw-r--r--dev-python/twisted/twisted-20.3.0.ebuild6
2 files changed, 12 insertions, 0 deletions
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 1112e8b1d49f..074f0cee66f7 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -86,6 +86,12 @@ python_prepare_all() {
# sphinx (including on py2)
rm src/twisted/python/test/test_release.py || die
+ # 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"
+
# puts system in EMFILE state, then the exception handler may fail
# trying to open more files due to some gi magic
sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 1f547fbdba48..3294057943d2 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -90,6 +90,12 @@ python_prepare_all() {
# sphinx (including on py2)
rm src/twisted/python/test/test_release.py || die
+ # 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"
+
# puts system in EMFILE state, then the exception handler may fail
# trying to open more files due to some gi magic
sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \