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@gentoo.org>

diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 1112e8b1d49f8a4f7a339dedb21e3b7ddaff0d23..074f0cee66f78455aed9b575fe8a1a16f5c39269 100644 (file)
--- 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 1f547fbdba48b93dab6a5ee149df34d18fab90d3..3294057943d203feb29ec8bc939581c10b6e4981 100644 (file)
--- 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":' \