mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
dev-python/requests: remove unused patch(es)
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24145 Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
committed by
Michał Górny
parent
549c812fa5
commit
864998019f
@@ -1,30 +0,0 @@
|
||||
From 6552e5374c335d62ba960a74b5b978897c823376 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Wed, 28 Jul 2021 10:33:22 +0200
|
||||
Subject: [PATCH] Fix creating non-listening sockets in tests on some platforms
|
||||
|
||||
Fix the listen() invocation for the test server not to pass a backlog
|
||||
value of zero. The value of zero means no backlog which effectively
|
||||
means that the socket can not accept any connections. This does not
|
||||
matter for the majority of platforms since the value is only advisory
|
||||
and the platform tends to go with a bigger backlog anyway. However,
|
||||
a few platforms (e.g. alpha or riscv Linux) do take the value literally,
|
||||
and therefore the tests fail since they are unable to connect to
|
||||
the server. Let Python use a 'default reasonable value' instead.
|
||||
---
|
||||
tests/testserver/server.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/testserver/server.py b/tests/testserver/server.py
|
||||
index 132221f7c4..92dcb6cb1a 100644
|
||||
--- a/tests/testserver/server.py
|
||||
+++ b/tests/testserver/server.py
|
||||
@@ -78,7 +78,7 @@ def run(self):
|
||||
def _create_socket_and_bind(self):
|
||||
sock = socket.socket()
|
||||
sock.bind((self.host, self.port))
|
||||
- sock.listen(0)
|
||||
+ sock.listen()
|
||||
return sock
|
||||
|
||||
def _close_server_sock_ignore_errors(self):
|
||||
@@ -1,35 +0,0 @@
|
||||
From 55da533a87afe188282b7f8dfbadeb30c21743d8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Sat, 27 Nov 2021 10:33:35 +0100
|
||||
Subject: [PATCH] Defer the trustme import until inside the fixture
|
||||
|
||||
Move the trustme import from global scope into the nosan_server fixture
|
||||
in order to make it possible to deselect the test via command-line
|
||||
when trustme is not available.
|
||||
---
|
||||
tests/conftest.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/conftest.py b/tests/conftest.py
|
||||
index 099462cf52..4f9b2641b4 100644
|
||||
--- a/tests/conftest.py
|
||||
+++ b/tests/conftest.py
|
||||
@@ -13,7 +13,6 @@
|
||||
|
||||
import pytest
|
||||
from requests.compat import urljoin
|
||||
-import trustme
|
||||
|
||||
|
||||
def prepare_url(value):
|
||||
@@ -38,6 +37,10 @@ def httpbin_secure(httpbin_secure):
|
||||
|
||||
@pytest.fixture
|
||||
def nosan_server(tmp_path_factory):
|
||||
+ # delay importing until the fixture in order to make it possible
|
||||
+ # to deselect the test via command-line when trustme is not available
|
||||
+ import trustme
|
||||
+
|
||||
tmpdir = tmp_path_factory.mktemp("certs")
|
||||
ca = trustme.CA()
|
||||
# only commonName, no subjectAltName
|
||||
Reference in New Issue
Block a user