File paramiko-pr1655-remove-pytest-relaxed.patch of Package python-paramiko

Overview Repositories Revisions Requests Users Attributes Meta

File paramiko-pr1655-remove-pytest-relaxed.patch of Package python-paramiko (Revision 33b9415cf5b7d23a1a6f485c85c450f1)

Currently displaying revision 33b9415cf5b7d23a1a6f485c85c450f1 , Show latest

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.7.2/setup.cfg
===================================================================
--- paramiko-2.7.2.orig/setup.cfg
+++ paramiko-2.7.2/setup.cfg
@@ -13,7 +13,6 @@ ignore = E124,E125,E128,E261,E301,E302,E
 max-line-length = 79
 
 [tool:pytest]
-addopts = -p no:relaxed
 looponfailroots = tests paramiko
 filterwarnings = 
 	ignore::DeprecationWarning:pkg_resources
Index: paramiko-2.7.2/tests/test_client.py
===================================================================
--- paramiko-2.7.2.orig/tests/test_client.py
+++ paramiko-2.7.2/tests/test_client.py
@@ -33,7 +33,7 @@ import warnings
 import weakref
 from tempfile import mkstemp
 
-from pytest_relaxed import raises
+import pytest
 from mock import patch, Mock
 
 import paramiko
@@ -684,10 +684,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 pytest.raises(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 +705,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 pytest.raises(AuthenticationException):
+            self._test_connection(
+                key_filename=_support("test_rsa_password.key"),
+                password="television",
+                passphrase="wat? lol no",
+            )

Places

File paramiko-pr1655-remove-pytest-relaxed.patch of Package python-paramiko (Revision 33b9415cf5b7d23a1a6f485c85c450f1)

Places