summaryrefslogtreecommitdiff
blob: 4b15f6a50502ea8b471dff0b72bbdd9f6f0c9652 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Skip tests requiring pytest-relaxed since it was removed from the tree due to
breaking pytest.

--- paramiko-2.6.0/tests/test_client.py
+++ paramiko-2.6.0/tests/test_client.py
@@ -33,7 +33,7 @@
 import weakref
 from tempfile import mkstemp
 
-from pytest_relaxed import raises
+#from pytest_relaxed import raises
 from mock import patch, Mock
 
 import paramiko
@@ -684,7 +684,8 @@
 
     # TODO: more granular exception pending #387; should be signaling "no auth
     # methods available" because no key and no password
-    @raises(SSHException)
+    #@raises(SSHException)
+    @unittest.skip("skip tests requiring pytest-relaxed")
     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")
@@ -705,7 +706,8 @@
             password="television",
         )
 
-    @raises(AuthenticationException)  # TODO: more granular
+    #@raises(AuthenticationException)  # TODO: more granular
+    @unittest.skip("skip tests requiring pytest-relaxed")
     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
         self
     ):