$OpenBSD: patch-tests_test_client_py,v 1.1 2019/11/10 11:04:45 kmos Exp $

Excise py-test-relaxed

Index: tests/test_client.py
--- tests/test_client.py.orig
+++ tests/test_client.py
@@ -33,7 +33,6 @@ import warnings
 import weakref
 from tempfile import mkstemp
 
-from pytest_relaxed import raises
 from mock import patch, Mock
 
 import paramiko
@@ -682,13 +681,6 @@ class PasswordPassphraseTests(ClientTest):
         # Straightforward / duplicate of earlier basic password test.
         self._test_connection(password="pygmalion")
 
-    # 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")
-
     def test_passphrase_kwarg_used_for_key_passphrase(self):
         # Straightforward again, with new passphrase kwarg.
         self._test_connection(
@@ -705,14 +697,3 @@ class PasswordPassphraseTests(ClientTest):
             password="television",
         )
 
-    @raises(AuthenticationException)  # TODO: more granular
-    def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
-        self
-    ):
-        # 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",
-        )
