Accepting request 841496 from home:bnavigator:branches:devel:languages:python:pytest

- remove dependency on pytest-relaxed
  * paramiko-pr1655-remove-pytest-relaxed.patch
  * gh#paramiko/paramiko#1655

OBS-URL: https://build.opensuse.org/request/show/841496
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-paramiko?expand=0&rev=94

paramiko-pr1655-remove-pytest-relaxed.patch

@@ -0,0 +1,77 @@
+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",
++            )

python-paramiko.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 13 10:51:07 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- remove dependency on pytest-relaxed
+  * paramiko-pr1655-remove-pytest-relaxed.patch
+  * gh#paramiko/paramiko#1655 
+
 -------------------------------------------------------------------
 Fri Sep  4 06:29:23 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
 

python-paramiko.spec

@@ -26,6 +26,8 @@ Group:          Documentation/Other
 URL:            http://www.paramiko.org/
 Source0:        https://files.pythonhosted.org/packages/source/p/paramiko/paramiko-%{version}.tar.gz
 Patch0:         paramiko-test_extend_timeout.patch
+# PATCH-FIX-UPSTREAM paramiko-pr1655-remove-pytest-relaxed.patch gh#paramiko/paramiko#1655 -- pytest-relaxed is broken
+Patch1:         paramiko-pr1655-remove-pytest-relaxed.patch
 BuildRequires:  %{python_module PyNaCl >= 1.0.1}
 BuildRequires:  %{python_module bcrypt >= 3.1.3}
 BuildRequires:  %{python_module cryptography >= 2.5}
@@ -33,8 +35,8 @@ BuildRequires:  %{python_module gssapi}
 BuildRequires:  %{python_module invocations}
 BuildRequires:  %{python_module invoke}
 BuildRequires:  %{python_module pyasn1 >= 0.1.7}
-BuildRequires:  %{python_module pytest-relaxed}
 BuildRequires:  %{python_module pytest-xdist}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -46,7 +48,6 @@ Requires:       python-cryptography >= 2.5
 Requires:       python-pyasn1 >= 0.1.7
 BuildArch:      noarch
 BuildRequires:  %{python_module mock}
-BuildRequires:  %{python_module pytest}
 %python_subpackages
 
 %description
@@ -83,7 +84,6 @@ find demos -name "*.py" -exec sed -i "/#\!\/usr\/bin\/.*/d" {} \;
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-export LANG=en_US.UTF-8
 %pytest
 
 %files %{python_files}