diff --git a/paramiko-2.4.1-drop-pytest-relaxed.patch b/paramiko-2.4.1-drop-pytest-relaxed.patch new file mode 100644 index 0000000..d772e7d --- /dev/null +++ b/paramiko-2.4.1-drop-pytest-relaxed.patch @@ -0,0 +1,49 @@ +diff --git a/tests/test_client.py b/tests/test_client.py +index 7163fdc..947e4b3 100644 +--- a/tests/test_client.py ++++ b/tests/test_client.py +@@ -33,7 +33,7 @@ import warnings + import weakref + from tempfile import mkstemp + +-from pytest_relaxed import raises ++from pytest import raises + + import paramiko + from paramiko.pkey import PublicBlob +@@ -656,10 +656,10 @@ class PasswordPassphraseTests(ClientTest): + + # TODO: more granular exception pending #387; should be signaling "no auth + # methods available" because no key and no password +- @raises(SSHException) + def test_passphrase_kwarg_not_used_for_password_auth(self): +- # Using the "right" password in the "wrong" field shouldn't work. +- self._test_connection(passphrase='pygmalion') ++ with raises(SSHException): ++ # Using the "right" password in the "wrong" field shouldn't work. ++ self._test_connection(passphrase='pygmalion') + + def test_passphrase_kwarg_used_for_key_passphrase(self): + # Straightforward again, with new passphrase kwarg. +@@ -675,12 +675,12 @@ class PasswordPassphraseTests(ClientTest): + password='television', + ) + +- @raises(AuthenticationException) # TODO: more granular + def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(self): # noqa +- # Sanity: if we're given both fields, the password field is NOT used as +- # a passphrase. +- self._test_connection( +- key_filename=_support('test_rsa_password.key'), +- password='television', +- passphrase='wat? lol no', +- ) ++ with raises(AuthenticationException): # TODO: more granular ++ # Sanity: if we're given both fields, the password field is NOT used as ++ # a passphrase. ++ self._test_connection( ++ key_filename=_support('test_rsa_password.key'), ++ password='television', ++ passphrase='wat? lol no', ++ ) + diff --git a/python-paramiko.spec b/python-paramiko.spec index b36935a..0426633 100644 --- a/python-paramiko.spec +++ b/python-paramiko.spec @@ -7,6 +7,7 @@ URL: https://github.com/paramiko/paramiko Source0: https://github.com/paramiko/paramiko/archive/%{version}/paramiko-%{version}.tar.gz Patch0: paramiko-2.3.1-disable-gssapi-on-unsupported-version.patch +Patch1: paramiko-2.4.1-drop-pytest-relaxed.patch BuildArch: noarch