summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2019-12-16 17:57:17 +0100
committerSebastian Pipping <sping@gentoo.org>2019-12-16 18:02:09 +0100
commit0f8f02e2d863c8a591ea9bdb1a623527ec2313ba (patch)
treed9b60368b5d63869f9952e4dfe47540240d2eccc /dev-python/paramiko/files
parentsys-fs/squashfs-tools: arm64 stable (bug #697692) (diff)
downloadgentoo-0f8f02e2d863c8a591ea9bdb1a623527ec2313ba.tar.gz
gentoo-0f8f02e2d863c8a591ea9bdb1a623527ec2313ba.tar.bz2
gentoo-0f8f02e2d863c8a591ea9bdb1a623527ec2313ba.zip
dev-python/paramiko: 2.7.1
Closes: https://bugs.gentoo.org/702020 Signed-off-by: Sebastian Pipping <sping@gentoo.org> Package-Manager: Portage-2.3.81, Repoman-2.3.20
Diffstat (limited to 'dev-python/paramiko/files')
-rw-r--r--dev-python/paramiko/files/paramiko-2.7.1-tests.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
new file mode 100644
index 000000000000..9c3570c2c58d
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
@@ -0,0 +1,62 @@
+From e3e904cc88a08e88c9051de4f5a6f1b6e78bf4a6 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 16 Dec 2019 17:39:50 +0100
+Subject: [PATCH] Strip use of pytest-relaxed
+
+.. since it was removed from the tree due to breaking pytest.
+---
+ tests/test_client.py | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/tests/test_client.py b/tests/test_client.py
+index 60ad310..22a2e40 100644
+--- a/tests/test_client.py
++++ b/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
+@@ -684,10 +683,10 @@ class PasswordPassphraseTests(ClientTest):
+
+ # 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")
++ with self.assertRaises(SSHException):
++ # 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.
+@@ -705,14 +704,14 @@ 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",
+- )
++ with self.assertRaises(AuthenticationException):
++ # 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",
++ )
+--
+2.23.0
+