From 40791ac9da2ba3b16b800397abf785fe78a62b84 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 13 Sep 2022 14:26:58 -0700 Subject: [PATCH] Enable all tests and drop no longer needed test patch. Signed-off-by: Kevin Fenzi --- python-requests.spec | 15 +++++---------- requests-2.28.1-tests_nonet.patch | 11 ----------- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 requests-2.28.1-tests_nonet.patch diff --git a/python-requests.spec b/python-requests.spec index 24ff321..7e7ffb6 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.28.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -20,13 +20,6 @@ Source0: https://github.com/requests/requests/archive/v%{version}/request # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: requests-2.28.1-system-certs.patch -# Use 127.0.0.1 not localhost for socket.bind() in the Server test -# class, to fix tests in Koji's no-network environment -# This probably isn't really upstreamable, because I guess localhost -# could technically be IPv6 or something, and our no-network env is -# a pretty odd one so this is a niche requirement. -Patch1: requests-2.28.1-tests_nonet.patch - BuildArch: noarch %description @@ -90,8 +83,7 @@ sed -i 's/ --doctest-modules//' pyproject.toml %if %{with tests} %check -# Omitted tests use a TARPIT server so require network connection -%pytest -v -k "not (test_connect_timeout or test_total_timeout_connect)" +%pytest -v %endif @@ -101,6 +93,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Tue Sep 13 2022 Kevin Fenzi - 2.28.1-3 +- Enable all tests and drop no longer needed test patch. + * Fri Jul 22 2022 Fedora Release Engineering - 2.28.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/requests-2.28.1-tests_nonet.patch b/requests-2.28.1-tests_nonet.patch deleted file mode 100644 index 32e96ee..0000000 --- a/requests-2.28.1-tests_nonet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- requests-2.28.1/tests/testserver/server.py 2022-06-29 08:09:11.000000000 -0700 -+++ requests-2.28.1/tests/testserver/server.py.new 2022-07-12 14:04:30.218077055 -0700 -@@ -29,7 +29,7 @@ - def __init__( - self, - handler=None, -- host="localhost", -+ host="127.0.0.1", - port=0, - requests_to_handle=1, - wait_to_close_event=None,