2019-06-11 11:26:30 +00:00
|
|
|
Index: paramiko-2.5.0/tests/test_client.py
|
|
|
|
|
===================================================================
|
|
|
|
|
--- paramiko-2.5.0.orig/tests/test_client.py
|
|
|
|
|
+++ paramiko-2.5.0/tests/test_client.py
|
2019-02-14 19:17:12 +00:00
|
|
|
@@ -33,7 +33,7 @@ import warnings
|
|
|
|
|
import weakref
|
|
|
|
|
from tempfile import mkstemp
|
|
|
|
|
|
|
|
|
|
-from pytest_relaxed import raises
|
|
|
|
|
+import pytest
|
|
|
|
|
|
|
|
|
|
import paramiko
|
|
|
|
|
from paramiko.pkey import PublicBlob
|
2019-06-11 11:26:30 +00:00
|
|
|
@@ -662,7 +662,7 @@ class PasswordPassphraseTests(ClientTest
|
2019-02-14 19:17:12 +00:00
|
|
|
|
|
|
|
|
# TODO: more granular exception pending #387; should be signaling "no auth
|
|
|
|
|
# methods available" because no key and no password
|
|
|
|
|
- @raises(SSHException)
|
|
|
|
|
+ @pytest.mark.xfail(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")
|
2019-06-11 11:26:30 +00:00
|
|
|
@@ -683,7 +683,7 @@ class PasswordPassphraseTests(ClientTest
|
2019-02-14 19:17:12 +00:00
|
|
|
password="television",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
- @raises(AuthenticationException) # TODO: more granular
|
|
|
|
|
+ @pytest.mark.xfail(raises=AuthenticationException) # TODO: more granular
|
2019-06-11 11:26:30 +00:00
|
|
|
def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given( # noqa
|
2019-02-14 19:17:12 +00:00
|
|
|
self
|
2019-06-11 11:26:30 +00:00
|
|
|
):
|