forked from pool/python-paramiko
Ondřej Súkup
99e359078d
- dropped 1379.patch
- refreshed patches:
paramiko-test_extend_timeout.patch
relaxed.patch
1311.patch
* Add support for encrypt-then-MAC (ETM) schemes (hmac-sha2-256-etm@openssh.com,
hmac-sha2-512-etm@openssh.com) and two newer Diffie-Hellman group key exchange
algorithms (group14, using SHA256; and group16, using SHA512).
* Add support for Curve25519 key exchange.
* Raise Cryptography dependency requirement to version 2.5
* Add support for the modern (as of Python 3.3) import location of MutableMapping
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-paramiko?expand=0&rev=86
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
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
|
|
@@ -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
|
|
@@ -662,7 +662,7 @@ class PasswordPassphraseTests(ClientTest
|
|
|
|
# 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")
|
|
@@ -683,7 +683,7 @@ class PasswordPassphraseTests(ClientTest
|
|
password="television",
|
|
)
|
|
|
|
- @raises(AuthenticationException) # TODO: more granular
|
|
+ @pytest.mark.xfail(raises=AuthenticationException) # TODO: more granular
|
|
def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given( # noqa
|
|
self
|
|
):
|