commit: 41b210e3e9683295fff6caf9d1ffb0c7b591a2fb
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 22:23:01 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 22:23:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b210e3
dev-python/twisted: drop conch tests
Forward commit 640ceed5adb749f557d2d55bd2cd07303a1a4d9d.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-python/twisted/twisted-19.10.0.ebuild | 6 ++++++
dev-python/twisted/twisted-20.3.0.ebuild | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild
b/dev-python/twisted/twisted-19.10.0.ebuild
index 1112e8b1d49..074f0cee66f 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 1f547fbdba4..3294057943d 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":' \
