summaryrefslogtreecommitdiffstats
path: root/debian/patches/remove_pytest_relaxed.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 17:47:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 17:47:36 +0000
commit7a45763ef91e6aedd9903fd736cc4490622fe333 (patch)
treef3b05657cebd31f81b2a7bb175dd32a3e0926588 /debian/patches/remove_pytest_relaxed.patch
parentAdding upstream version 3.4.0. (diff)
downloadparamiko-7a45763ef91e6aedd9903fd736cc4490622fe333.tar.xz
paramiko-7a45763ef91e6aedd9903fd736cc4490622fe333.zip
Adding debian version 3.4.0-1.debian/3.4.0-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/remove_pytest_relaxed.patch')
-rw-r--r--debian/patches/remove_pytest_relaxed.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/debian/patches/remove_pytest_relaxed.patch b/debian/patches/remove_pytest_relaxed.patch
new file mode 100644
index 0000000..70a8e0a
--- /dev/null
+++ b/debian/patches/remove_pytest_relaxed.patch
@@ -0,0 +1,63 @@
+From: Debian Python Modules Team
+ <python-modules-team@lists.alioth.debian.org>
+Date: Wed, 2 Sep 2020 10:30:06 +0200
+Subject: remove_pytest_relaxed
+
+---
+ setup.cfg | 1 -
+ tests/test_client.py | 23 ++++++++++++-----------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+Index: paramiko/tests/test_client.py
+===================================================================
+--- paramiko.orig/tests/test_client.py
++++ paramiko/tests/test_client.py
+@@ -33,7 +33,7 @@ import weakref
+ from tempfile import mkstemp
+
+ import pytest
+-from pytest_relaxed import raises
++from pytest import raises
+ from unittest.mock import patch, Mock
+
+ import paramiko
+@@ -797,13 +797,13 @@ 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)
+ @requires_sha1_signing
+ 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")
++ # TODO: more granular exception pending #387; should be signaling "no auth
++ # methods available" because no key and no password
++ with raises(SSHException):
++ self._test_connection(passphrase='pygmalion')
+
+ @requires_sha1_signing
+ def test_passphrase_kwarg_used_for_key_passphrase(self):
+@@ -823,15 +823,15 @@ class PasswordPassphraseTests(ClientTest
+ password="television",
+ )
+
+- @raises(AuthenticationException) # TODO: more granular
+ @requires_sha1_signing
+ 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 raises(AuthenticationException): # TODO: more granular
++ self._test_connection(
++ key_filename=_support("test_rsa_password.key"),
++ password="television",
++ passphrase="wat? lol no",
++ )