|
 |
128040 |
diff --git a/dev-requirements.txt b/dev-requirements.txt
|
|
|
128040 |
index f4f84748..b1b0cdf5 100644
|
|
|
128040 |
--- a/dev-requirements.txt
|
|
|
128040 |
+++ b/dev-requirements.txt
|
|
|
128040 |
@@ -2,7 +2,6 @@
|
|
|
128040 |
invoke>=1.0,<2.0
|
|
|
128040 |
invocations>=1.2.0,<2.0
|
|
|
128040 |
pytest==4.4.2
|
|
|
128040 |
-pytest-relaxed==1.1.5
|
|
|
128040 |
# pytest-xdist for test dir watching and the inv guard task
|
|
|
128040 |
pytest-xdist==1.28.0
|
|
|
128040 |
mock==2.0.0
|
|
|
128040 |
diff --git a/setup.cfg b/setup.cfg
|
|
|
128040 |
index 44d029c4..99159096 100644
|
|
|
128040 |
--- a/setup.cfg
|
|
|
128040 |
+++ b/setup.cfg
|
|
|
128040 |
@@ -17,9 +17,6 @@ ignore = E124,E125,E128,E261,E301,E302,E303,E402,E721,W503,E203,E722
|
|
|
128040 |
max-line-length = 79
|
|
|
128040 |
|
|
|
128040 |
[tool:pytest]
|
|
|
128040 |
-# We use pytest-relaxed just for its utils at the moment, so disable it at the
|
|
|
128040 |
-# plugin level until we adapt test organization to really use it.
|
|
|
128040 |
-addopts = -p no:relaxed
|
|
|
128040 |
# Loop on failure
|
|
|
128040 |
looponfailroots = tests paramiko
|
|
|
128040 |
# Ignore some warnings we cannot easily handle.
|
|
|
128040 |
diff --git a/tests/test_client.py b/tests/test_client.py
|
|
|
128040 |
index 60ad310c..88fd1d53 100644
|
|
|
128040 |
--- a/tests/test_client.py
|
|
|
128040 |
+++ b/tests/test_client.py
|
|
|
128040 |
@@ -33,7 +33,7 @@ import warnings
|
|
|
128040 |
import weakref
|
|
|
128040 |
from tempfile import mkstemp
|
|
|
128040 |
|
|
|
128040 |
-from pytest_relaxed import raises
|
|
|
128040 |
+import pytest
|
|
|
128040 |
from mock import patch, Mock
|
|
|
128040 |
|
|
|
128040 |
import paramiko
|
|
|
128040 |
@@ -684,10 +684,10 @@ class PasswordPassphraseTests(ClientTest):
|
|
|
128040 |
|
|
|
128040 |
# TODO: more granular exception pending #387; should be signaling "no auth
|
|
|
128040 |
# methods available" because no key and no password
|
|
|
128040 |
- @raises(SSHException)
|
|
|
128040 |
def test_passphrase_kwarg_not_used_for_password_auth(self):
|
|
|
128040 |
- # Using the "right" password in the "wrong" field shouldn't work.
|
|
|
128040 |
- self._test_connection(passphrase="pygmalion")
|
|
|
128040 |
+ with pytest.raises(SSHException):
|
|
|
128040 |
+ # Using the "right" password in the "wrong" field shouldn't work.
|
|
|
128040 |
+ self._test_connection(passphrase="pygmalion")
|
|
|
128040 |
|
|
|
128040 |
def test_passphrase_kwarg_used_for_key_passphrase(self):
|
|
|
128040 |
# Straightforward again, with new passphrase kwarg.
|
|
|
128040 |
@@ -705,14 +705,14 @@ class PasswordPassphraseTests(ClientTest):
|
|
|
128040 |
password="television",
|
|
|
128040 |
)
|
|
|
128040 |
|
|
|
128040 |
- @raises(AuthenticationException) # TODO: more granular
|
|
|
128040 |
def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given( # noqa
|
|
|
128040 |
self
|
|
|
128040 |
):
|
|
|
128040 |
# Sanity: if we're given both fields, the password field is NOT used as
|
|
|
128040 |
# a passphrase.
|
|
|
128040 |
- self._test_connection(
|
|
|
128040 |
- key_filename=_support("test_rsa_password.key"),
|
|
|
128040 |
- password="television",
|
|
|
128040 |
- passphrase="wat? lol no",
|
|
|
128040 |
- )
|
|
|
128040 |
+ with pytest.raises(AuthenticationException):
|
|
|
128040 |
+ self._test_connection(
|
|
|
128040 |
+ key_filename=_support("test_rsa_password.key"),
|
|
|
128040 |
+ password="television",
|
|
|
128040 |
+ passphrase="wat? lol no",
|
|
|
128040 |
+ )
|