summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2019-07-06 02:25:31 -0600
committerTim Harder <radhermit@gentoo.org>2019-07-06 02:27:24 -0600
commit95980684d12ca16c784ff4aad9c1468e5141d5ba (patch)
tree76878d5d0ff91e71d9c6a00dfe2d3e53df5cc621 /dev-python/paramiko/files
parentx11-wm/mutter: remove problematic patch series from new patchset (diff)
downloadgentoo-95980684d12ca16c784ff4aad9c1468e5141d5ba.tar.gz
gentoo-95980684d12ca16c784ff4aad9c1468e5141d5ba.tar.bz2
gentoo-95980684d12ca16c784ff4aad9c1468e5141d5ba.zip
dev-python/paramiko: version bump to 2.6.0
Signed-off-by: Tim Harder <radhermit@gentoo.org>
Diffstat (limited to 'dev-python/paramiko/files')
-rw-r--r--dev-python/paramiko/files/paramiko-2.6.0-tests.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/dev-python/paramiko/files/paramiko-2.6.0-tests.patch b/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
new file mode 100644
index 000000000000..4b15f6a50502
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
@@ -0,0 +1,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
+ ):