forked from pool/python-paramiko
Matej Cepl
7841ed9f7e
- Update to 2.12.0 * [Feature] #2125: (also re: #2054) Add a transport_factory kwarg to SSHClient.connect for advanced users to gain more control over early Transport setup and manipulation. Thanks to Noah Pederson for the patch. - Release 2.11.1 * [Bug]: bug:1637 (via #1599) Raise SSHException explicitly when blank private key data is loaded, instead of the natural result of IndexError. This should help more bits of Paramiko or Paramiko-adjacent codebases to correctly handle this class of error. Credit: Nicholas Dietz. * [Bug] #1822: (via, and relating to, far too many other issues to mention here) Update SSHClient so it explicitly closes its wrapped socket object upon encountering socket errors at connection time. This should help somewhat with certain classes of memory leaks, resource warnings, and/or errors (though we hasten to remind everyone that Client and Transport have their own .close() methods for use in non-error situations!). Patch courtesy of @YoavCohen. - Rename and refresh: - paramiko-pr1655-remove-pytest-relaxed.patch + paramiko-pr1665-remove-pytest-relaxed.patch * gh#paramiko/paramiko#1665 OBS-URL: https://build.opensuse.org/request/show/1036973 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-paramiko?expand=0&rev=107
67 lines
2.6 KiB
Diff
67 lines
2.6 KiB
Diff
From 5844aa0270d3ad8feab4bf1023e35aa4fc255b6c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Thu, 16 Apr 2020 09:22:59 +0200
|
|
Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises
|
|
|
|
There is really no technical reason to bring pytest-relaxed to call
|
|
@raises as a decorator while plain pytest works just fine. Plus,
|
|
pytest.raises() is used in test_sftp already.
|
|
|
|
pytest-relaxed causes humongous breakage to other packages
|
|
on the system. It has been banned from Gentoo for this reason.
|
|
---
|
|
dev-requirements.txt | 1 - (removed from patch=
|
|
setup.cfg | 3 ---
|
|
tests/test_client.py | 20 ++++++++++----------
|
|
3 files changed, 10 insertions(+), 14 deletions(-)
|
|
|
|
Index: paramiko-2.12.0/tests/test_client.py
|
|
===================================================================
|
|
--- paramiko-2.12.0.orig/tests/test_client.py
|
|
+++ paramiko-2.12.0/tests/test_client.py
|
|
@@ -34,7 +34,6 @@ import weakref
|
|
from tempfile import mkstemp
|
|
|
|
import pytest
|
|
-from pytest_relaxed import raises
|
|
from mock import patch, Mock
|
|
|
|
import paramiko
|
|
@@ -787,11 +786,11 @@ class PasswordPassphraseTests(ClientTest
|
|
|
|
# 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")
|
|
+ with pytest.raises(SSHException):
|
|
+ # Using the "right" password in the "wrong" field shouldn't work.
|
|
+ self._test_connection(passphrase="pygmalion")
|
|
|
|
@requires_sha1_signing
|
|
def test_passphrase_kwarg_used_for_key_passphrase(self):
|
|
@@ -811,15 +810,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 pytest.raises(AuthenticationException):
|
|
+ self._test_connection(
|
|
+ key_filename=_support("test_rsa_password.key"),
|
|
+ password="television",
|
|
+ passphrase="wat? lol no",
|
|
+ )
|