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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
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",
+ )
|
