From ff2846ff3d6351c180380d9990ef609dc27cc8ef Mon Sep 17 00:00:00 2001 From: cle-b Date: Mon, 10 Aug 2026 22:16:59 +0200 Subject: [PATCH 1/2] fix incompatibility with requests 2.34 --- requirements-dev.txt | 2 +- tests/test_allure.py | 4 ++-- tests/test_plugin.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b60818a..f7c32f2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ flake8 black pytest>7 -requests<2.34 # until httpdbg and/or requests are fixed: "You can only merge into CookieJar" +requests build Jinja2 Werkzeug diff --git a/tests/test_allure.py b/tests/test_allure.py index a9efaf3..81d0981 100644 --- a/tests/test_allure.py +++ b/tests/test_allure.py @@ -56,7 +56,7 @@ def test_post(httpbin, fixture_session, fixture_function): requests.post(httpbin.url + "/post", json={"a":"b"}) """) - result = pytester.runpytest("--httpdbg-allure", f"--alluredir={tmp_path}") + result = pytester.runpytest_subprocess("--httpdbg-allure", f"--alluredir={tmp_path}") result.assert_outcomes(passed=2) @@ -98,7 +98,7 @@ def test_fail(httpbin): assert False """) - result = pytester.runpytest( + result = pytester.runpytest_subprocess( "--httpdbg-allure", f"--alluredir={tmp_path}", "--httpdbg-only-on-failure" ) diff --git a/tests/test_plugin.py b/tests/test_plugin.py index 749885a..375fea0 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -39,7 +39,7 @@ def test_post(httpbin, fixture_session): requests.post(httpbin.url + "/intest") """) - result = pytester.runpytest() + result = pytester.runpytest_subprocess() result.assert_outcomes(passed=2) @@ -60,7 +60,7 @@ def test_post(httpbin, fixture_session): requests.post(httpbin.url + "/intest") """) - result = pytester.runpytest("--httpdbg", "--httpdbg-dir", str(logs_dir)) + result = pytester.runpytest_subprocess("--httpdbg", "--httpdbg-dir", str(logs_dir)) result.assert_outcomes(passed=2) @@ -90,7 +90,7 @@ def test_with_initiator_fake(httpbin): fakepackage.coucou(httpbin.url) """) - result = pytester.runpytest( + result = pytester.runpytest_subprocess( "--httpdbg", "--httpdbg-dir", str(logs_dir), @@ -126,7 +126,7 @@ def test_without_initiator_fake(httpbin): fakepackage.coucou(httpbin.url) """) - result = pytester.runpytest("--httpdbg", "--httpdbg-dir", str(logs_dir)) + result = pytester.runpytest_subprocess("--httpdbg", "--httpdbg-dir", str(logs_dir)) result.assert_outcomes(passed=1) From 64aae992201fa5e0757b8b67770f8e915519d1b2 Mon Sep 17 00:00:00 2001 From: cle-b Date: Mon, 10 Aug 2026 22:18:33 +0200 Subject: [PATCH 2/2] code format --- tests/test_allure.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_allure.py b/tests/test_allure.py index 81d0981..79374c0 100644 --- a/tests/test_allure.py +++ b/tests/test_allure.py @@ -56,7 +56,9 @@ def test_post(httpbin, fixture_session, fixture_function): requests.post(httpbin.url + "/post", json={"a":"b"}) """) - result = pytester.runpytest_subprocess("--httpdbg-allure", f"--alluredir={tmp_path}") + result = pytester.runpytest_subprocess( + "--httpdbg-allure", f"--alluredir={tmp_path}" + ) result.assert_outcomes(passed=2)