add patch
This commit is contained in:
19909236985
parent
9f3e6cab03
commit
425a500985
48
Remove-tests-that-use-the-tarpit.patch
Normal file
48
Remove-tests-that-use-the-tarpit.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From bb1c91432c5e9a1f402692db5c80c65136656afb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeremy Cline <jeremy@jcline.org>
|
||||||
|
Date: Tue, 13 Jun 2017 09:08:09 -0400
|
||||||
|
Subject: [PATCH] Remove tests that use the tarpit
|
||||||
|
|
||||||
|
The latest version of Mock has started using systemd containers. The
|
||||||
|
systemd-nspawn command is being run with --private-network, which
|
||||||
|
immediately kills connections to something other than localhost. These
|
||||||
|
tests depend on the connection not being killed immediately and that
|
||||||
|
they are never responded to.
|
||||||
|
|
||||||
|
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
|
||||||
|
---
|
||||||
|
diff -Naur requests-2.24.0/tests/test_requests.py requests-2/tests/test_requests.py
|
||||||
|
--- requests-2.24.0/tests/test_requests.py 2020-08-04 18:05:14.250000000 +0800
|
||||||
|
+++ requests-2/tests/test_requests.py 2020-08-04 18:13:19.891000000 +0800
|
||||||
|
@@ -2188,30 +2188,6 @@
|
||||||
|
except ReadTimeout:
|
||||||
|
pass
|
||||||
|
|
||||||
|
- @pytest.mark.parametrize(
|
||||||
|
- 'timeout', (
|
||||||
|
- (0.1, None),
|
||||||
|
- Urllib3Timeout(connect=0.1, read=None)
|
||||||
|
- ))
|
||||||
|
- def test_connect_timeout(self, timeout):
|
||||||
|
- try:
|
||||||
|
- requests.get(TARPIT, timeout=timeout)
|
||||||
|
- pytest.fail('The connect() request should time out.')
|
||||||
|
- except ConnectTimeout as e:
|
||||||
|
- assert isinstance(e, ConnectionError)
|
||||||
|
- assert isinstance(e, Timeout)
|
||||||
|
-
|
||||||
|
- @pytest.mark.parametrize(
|
||||||
|
- 'timeout', (
|
||||||
|
- (0.1, 0.1),
|
||||||
|
- Urllib3Timeout(connect=0.1, read=0.1)
|
||||||
|
- ))
|
||||||
|
- def test_total_timeout_connect(self, timeout):
|
||||||
|
- try:
|
||||||
|
- requests.get(TARPIT, timeout=timeout)
|
||||||
|
- pytest.fail('The connect() request should time out.')
|
||||||
|
- except ConnectTimeout:
|
||||||
|
- pass
|
||||||
|
|
||||||
|
def test_encoded_methods(self, httpbin):
|
||||||
|
"""See: https://github.com/psf/requests/issues/2316"""
|
||||||
|
|
||||||
6
_service
Normal file
6
_service
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<services>
|
||||||
|
<service name="tar_scm_kernel_repo">
|
||||||
|
<param name="scm">repo</param>
|
||||||
|
<param name="url">next/openEuler/python-requests</param>
|
||||||
|
</service>
|
||||||
|
</services>
|
||||||
36
patch-requests-certs.py-to-use-the-system-CA-bundle.patch
Normal file
36
patch-requests-certs.py-to-use-the-system-CA-bundle.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From aad5590d5ea47dc54cfd97da54f2640014f7d39d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeremy Cline <jcline@redhat.com>
|
||||||
|
Date: Thu, 13 Dec 2018 10:55:29 -0500
|
||||||
|
Subject: [PATCH] Patch requests/certs.py to use the system CA bundle
|
||||||
|
|
||||||
|
Signed-off-by: Jeremy Cline <jcline@redhat.com>
|
||||||
|
---
|
||||||
|
diff -Naur requests-2.24.0/requests/certs.py requests-1/requests/certs.py
|
||||||
|
--- requests-2.24.0/requests/certs.py 2020-08-04 18:05:14.250000000 +0800
|
||||||
|
+++ requests-1/requests/certs.py 2020-08-04 18:07:20.652000000 +0800
|
||||||
|
@@ -10,8 +10,13 @@
|
||||||
|
If you are packaging Requests, e.g., for a Linux distribution or a managed
|
||||||
|
environment, you can change the definition of where() to return a separately
|
||||||
|
packaged CA bundle.
|
||||||
|
+
|
||||||
|
+This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided
|
||||||
|
+by the ca-certificates RPM package.
|
||||||
|
"""
|
||||||
|
-from certifi import where
|
||||||
|
+def where():
|
||||||
|
+ """Return the absolute path to the system CA bundle."""
|
||||||
|
+ return '/etc/pki/tls/certs/ca-bundle.crt'
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
print(where())
|
||||||
|
diff -Naur requests-2.24.0/setup.py requests-1/setup.py
|
||||||
|
--- requests-2.24.0/setup.py 2020-08-04 18:05:14.250000000 +0800
|
||||||
|
+++ requests-1/setup.py 2020-08-04 18:07:46.508000000 +0800
|
||||||
|
@@ -45,7 +45,6 @@
|
||||||
|
'chardet>=3.0.2,<4',
|
||||||
|
'idna>=2.5,<3',
|
||||||
|
'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1',
|
||||||
|
- 'certifi>=2017.4.17'
|
||||||
|
|
||||||
|
]
|
||||||
|
test_requirements = [
|
||||||
@ -8,8 +8,10 @@ License: ASL 2.0
|
|||||||
URL: http://python-requests.org/
|
URL: http://python-requests.org/
|
||||||
Source0: https://github.com/psf/requests/archive/v%{version}.tar.gz
|
Source0: https://github.com/psf/requests/archive/v%{version}.tar.gz
|
||||||
|
|
||||||
Patch3: requests-2.12.4-tests_nonet.patch
|
Patch1: requests-2.12.4-tests_nonet.patch
|
||||||
Patch5: requests-2.20.0-no-py2-httpbin.patch
|
Patch2: requests-2.20.0-no-py2-httpbin.patch
|
||||||
|
Patch3: patch-requests-certs.py-to-use-the-system-CA-bundle.patch
|
||||||
|
Patch4: Remove-tests-that-use-the-tarpit.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -135,4 +137,4 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
|
|||||||
- DESC:add the provides of python3
|
- DESC:add the provides of python3
|
||||||
|
|
||||||
* Wed Sep 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.21.0-1
|
* Wed Sep 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.21.0-1
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user