diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-python/paramiko/files | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-python/paramiko/files')
-rw-r--r-- | dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch | 40 | ||||
-rw-r--r-- | dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch (renamed from dev-python/paramiko/files/paramiko-2.7.1-tests.patch) | 78 |
2 files changed, 66 insertions, 52 deletions
diff --git a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch new file mode 100644 index 000000000000..80fe876ef8e3 --- /dev/null +++ b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch @@ -0,0 +1,40 @@ +From 529558cc20e448e45e24dc7b7609cd62300838b8 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:46:39 +0200 +Subject: [PATCH] Skip tests requiring invoke if it's not installed + +Since invoke is an optional dependency and only one group of tests +require it, skip them gracefully rather than failing if it's not +present. +--- + tests/test_config.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/test_config.py b/tests/test_config.py +index 45fb262d..017d4bbf 100644 +--- a/tests/test_config.py ++++ b/tests/test_config.py +@@ -6,7 +6,11 @@ from socket import gaierror + + from paramiko.py3compat import string_types + +-from invoke import Result ++try: ++ from invoke import Result ++except ImportError: ++ Result = None ++ + from mock import patch + from pytest import raises, mark, fixture + +@@ -742,6 +746,7 @@ def _expect(success_on): + return inner + + ++@mark.skipif(Result is None, reason="requires invoke package") + class TestMatchExec(object): + @patch("paramiko.config.invoke", new=None) + @patch("paramiko.config.invoke_import_error", new=ImportError("meh")) +-- +2.35.1 + diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch index a25b7c24ef27..6e746aff1863 100644 --- a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch +++ b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch @@ -1,7 +1,7 @@ -From e91cac80d679dfe16897988b0c14c1293a93c805 Mon Sep 17 00:00:00 2001 +From 03741e48c83856e53fc3f1487d660165cb718c11 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 1/2] Replace pytest-relaxed with plain pytest.raises +Date: Tue, 17 May 2022 07:26:36 +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, @@ -11,24 +11,36 @@ pytest-relaxed causes humongous breakage to other packages on the system. It has been banned from Gentoo for this reason. --- dev-requirements.txt | 1 - - setup.cfg | 3 --- + pytest.ini | 3 --- tests/test_client.py | 20 ++++++++++---------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt -index f4f84748..b1b0cdf5 100644 +index 3ed9eb40..e90f3373 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,7 +2,6 @@ - invoke>=1.0,<2.0 - invocations>=1.2.0,<2.0 + invoke==1.6.0 + invocations==2.6.0 pytest==4.4.2 -pytest-relaxed==1.1.5 # pytest-xdist for test dir watching and the inv guard task pytest-xdist==1.28.0 mock==2.0.0 +diff --git a/pytest.ini b/pytest.ini +index be207cd8..5a506bcd 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,7 +1,4 @@ + [pytest] +-# We use pytest-relaxed just for its utils at the moment, so disable it at the +-# plugin level until we adapt test organization to really use it. +-addopts = -p no:relaxed + # Loop on failure + looponfailroots = tests paramiko + # Ignore some warnings we cannot easily handle. diff --git a/tests/test_client.py b/tests/test_client.py -index 60ad310c..88fd1d53 100644 +index fdf19c45..e4af71df 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -33,7 +33,7 @@ import warnings @@ -40,11 +52,12 @@ index 60ad310c..88fd1d53 100644 from mock import patch, Mock import paramiko -@@ -684,10 +684,10 @@ class PasswordPassphraseTests(ClientTest): +@@ -733,11 +733,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") @@ -52,13 +65,14 @@ index 60ad310c..88fd1d53 100644 + # 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): - # Straightforward again, with new passphrase kwarg. -@@ -705,14 +705,14 @@ class PasswordPassphraseTests(ClientTest): +@@ -757,15 +757,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 ): @@ -76,45 +90,5 @@ index 60ad310c..88fd1d53 100644 + passphrase="wat? lol no", + ) -- -2.26.1 - -From af228a2d950654ccdd4a5d665da0018bd976c108 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:46:39 +0200 -Subject: [PATCH 2/2] Skip tests requiring invoke if it's not installed - -Since invoke is an optional dependency and only one group of tests -require it, skip them gracefully rather than failing if it's not -present. ---- - tests/test_config.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tests/test_config.py b/tests/test_config.py -index 5e9aa059..5eeaeac3 100644 ---- a/tests/test_config.py -+++ b/tests/test_config.py -@@ -6,7 +6,11 @@ from socket import gaierror - - from paramiko.py3compat import string_types - --from invoke import Result -+try: -+ from invoke import Result -+except ImportError: -+ Result = None -+ - from mock import patch - from pytest import raises, mark, fixture - -@@ -705,6 +709,7 @@ def _expect(success_on): - return inner - - -+@mark.skipif(Result is None, reason='requires invoke package') - class TestMatchExec(object): - @patch("paramiko.config.invoke", new=None) - @patch("paramiko.config.invoke_import_error", new=ImportError("meh")) --- -2.26.1 +2.35.1 |