From 43518d2944cbfa21c30b44fa28155328b0bc7c401e420a213dc71cf463cb82ab Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 12 Oct 2020 21:16:08 +0000 Subject: [PATCH] - Add no-test_successResultOfWithFailureHasTraceback.patch to skip sted.conch.test.test_keys.KeyTests.test_fromOpenSSH, which fails. Upstream suggests https://twistedmatrix.com/trac/ticket/9665, but it has never been confirmed, even less fixed. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Twisted?expand=0&rev=93 --- ...ccessResultOfWithFailureHasTraceback.patch | 24 +++++++++++++++++++ python-Twisted.changes | 17 +++++-------- python-Twisted.spec | 3 +++ 3 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 no-test_successResultOfWithFailureHasTraceback.patch diff --git a/no-test_successResultOfWithFailureHasTraceback.patch b/no-test_successResultOfWithFailureHasTraceback.patch new file mode 100644 index 0000000..b58d4c2 --- /dev/null +++ b/no-test_successResultOfWithFailureHasTraceback.patch @@ -0,0 +1,24 @@ +--- + src/twisted/conch/test/test_keys.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/src/twisted/conch/test/test_keys.py ++++ b/src/twisted/conch/test/test_keys.py +@@ -6,6 +6,7 @@ Tests for L{twisted.conch.ssh.keys}. + """ + + from __future__ import absolute_import, division ++import unittest as pyunit + + from twisted.python.reflect import requireModule + +@@ -225,7 +226,8 @@ class KeyTests(unittest.TestCase): + for k, v in data.items(): + self.assertEqual(privateKey.data()[k], v) + +- ++ @pyunit.skip('Upstream ticket https://twistedmatrix.com/trac/ticket/9665' + ++ ' has still not been resolved.') + def test_fromOpenSSH(self): + """ + Test that keys are correctly generated from OpenSSH strings. diff --git a/python-Twisted.changes b/python-Twisted.changes index 4394209..39248d5 100644 --- a/python-Twisted.changes +++ b/python-Twisted.changes @@ -1,16 +1,11 @@ ------------------------------------------------------------------- -Thu May 28 12:43:51 UTC 2020 - Marketa Calabkova +Mon Oct 12 21:14:33 UTC 2020 - Matej Cepl -- Update to 20.3.0 - * drop Python 2 - * twisted.news is deprecated. - * twisted.conch.ssh now supports the curve25519-sha256 key exchange - algorithm (requires OpenSSL >= 1.1.0). - * many bugfixes and other miscelaneous fixes -- Fixed update-alternatives mechanism -- Added true-binary.patch -- Dropped python-38-xml-namespace.patch -- Reapplied python-38-hmac-digestmod.patch +- Add no-test_successResultOfWithFailureHasTraceback.patch to + skip sted.conch.test.test_keys.KeyTests.test_fromOpenSSH, + which fails. Upstream suggests + https://twistedmatrix.com/trac/ticket/9665, but it has never + been confirmed, even less fixed. ------------------------------------------------------------------- Mon May 18 13:15:58 UTC 2020 - Petr Gajdos diff --git a/python-Twisted.spec b/python-Twisted.spec index e0cb362..997b690 100644 --- a/python-Twisted.spec +++ b/python-Twisted.spec @@ -33,6 +33,9 @@ Patch3: test-mktime-invalid-tm_isdst.patch Patch5: python-38-hmac-digestmod.patch Patch6: python-38-no-cgi-parseqs.patch Patch7: true-binary.patch +# PATCH-FIX-UPSTREAM no-test_successResultOfWithFailureHasTraceback.patch https://twistedmatrix.com/trac/ticket/9665 mcepl@suse.com +# skip over the test test_successResultOfWithFailureHasTraceback +Patch8: no-test_successResultOfWithFailureHasTraceback.patch BuildRequires: %{python_module Automat >= 0.3.0} BuildRequires: %{python_module PyHamcrest >= 1.9.0} BuildRequires: %{python_module appdirs >= 1.4.0}