From b476f98381af7e7b369e788fffee817d4e4ebb45 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Sun, 19 Oct 2025 17:59:26 +0200 Subject: python3-betamax: fix ptests 1. Some tests require internet access. Set a DNS for that, if it is not available at the start of the test. 2. Added a backported patch that fixes some failing tests, due to a variable header value contained in a response. (fix-failing-ptest.patch) 3. Added a backported patch that avoids calling pytest fixtures directly. If not applied, tests calling them are marked as failing by pytest. (fix-direct-calls-to-test-fixtures.patch) Signed-off-by: Gyorgy Sarvari --- .../fix-direct-calls-to-test-fixtures.patch | 41 ++++++++++++++++++++ .../python/python3-betamax/fix-failing-ptest.patch | 44 ++++++++++++++++++++++ .../python/python3-betamax/run-ptest | 6 +++ .../python/python3-betamax_0.8.1.bb | 2 + 4 files changed, 93 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-betamax/fix-direct-calls-to-test-fixtures.patch create mode 100644 meta-python/recipes-devtools/python/python3-betamax/fix-failing-ptest.patch (limited to 'meta-python/recipes-devtools') diff --git a/meta-python/recipes-devtools/python/python3-betamax/fix-direct-calls-to-test-fixtures.patch b/meta-python/recipes-devtools/python/python3-betamax/fix-direct-calls-to-test-fixtures.patch new file mode 100644 index 0000000000..284506867a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-betamax/fix-direct-calls-to-test-fixtures.patch @@ -0,0 +1,41 @@ +From 165cc321f2b9839418269e9493b03eb2e43f7ddf Mon Sep 17 00:00:00 2001 +From: Jiri Kuncar +Date: Mon, 9 Sep 2019 12:23:18 +0200 +Subject: [PATCH] tests: fix direct calls to PyTest fixtures + +https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly + +Upstream-Status: Backport [https://github.com/betamaxpy/betamax/commit/165cc321f2b9839418269e9493b03eb2e43f7ddf] +Signed-off-by: Gyorgy Sarvari +--- + tests/unit/test_fixtures.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/unit/test_fixtures.py b/tests/unit/test_fixtures.py +index 387d9ce..41f33eb 100644 +--- a/tests/unit/test_fixtures.py ++++ b/tests/unit/test_fixtures.py +@@ -27,9 +27,9 @@ def test_adds_stop_as_a_finalizer(self): + # Mock a pytest request object + request = mock.MagicMock() + request.cls = request.module = None +- request.function.__name__ = 'test' ++ request.node.name = request.function.__name__ = 'test' + +- pytest_fixture.betamax_recorder(request) ++ pytest_fixture._betamax_recorder(request) + assert request.addfinalizer.called is True + request.addfinalizer.assert_called_once_with(self.mocked_betamax.stop) + +@@ -37,9 +37,9 @@ def test_auto_starts_the_recorder(self): + # Mock a pytest request object + request = mock.MagicMock() + request.cls = request.module = None +- request.function.__name__ = 'test' ++ request.node.name = request.function.__name__ = 'test' + +- pytest_fixture.betamax_recorder(request) ++ pytest_fixture._betamax_recorder(request) + self.mocked_betamax.start.assert_called_once_with() + + diff --git a/meta-python/recipes-devtools/python/python3-betamax/fix-failing-ptest.patch b/meta-python/recipes-devtools/python/python3-betamax/fix-failing-ptest.patch new file mode 100644 index 0000000000..5671033526 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-betamax/fix-failing-ptest.patch @@ -0,0 +1,44 @@ +From 0f5d51b1c7e3b9eb5c083621a00811a872323046 Mon Sep 17 00:00:00 2001 +From: Jaremy Hatler +Date: Fri, 22 Dec 2023 22:53:53 -0500 +Subject: [PATCH] fix: clear X-Amzn-Trace-Id in httbin.org responses (#2) + +The httbin.org service returns a X-Amzn-Trace-Id header in its +responses, which is different for each request. This causes the +tests to fail. This clears the header before comparing responses. + +Refs: #184, #190 +Signed-off-by: Jaremy Hatler + +Upstream-Status: Backport [https://github.com/jhatler/betamax/commit/0f5d51b1c7e3b9eb5c083621a00811a872323046] +--- + tests/integration/test_record_modes.py | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/tests/integration/test_record_modes.py b/tests/integration/test_record_modes.py +index 58c8846..988b851 100644 +--- a/tests/integration/test_record_modes.py ++++ b/tests/integration/test_record_modes.py +@@ -1,3 +1,5 @@ ++import re ++ + from betamax import Betamax, BetamaxError + + from tests.integration.helper import IntegrationHelper +@@ -39,8 +41,15 @@ def test_replays_response_from_cassette(self): + # this test to succeed. + # NOTE(hroncok): httpbin.org added X-Processed-Time header that + # can possibly differ (and often does) ++ r0_content = r0.content.decode(encoding='utf-8', errors='strict') ++ r1_content = r1.content.decode(encoding='utf-8', errors='strict') ++ r0_content = re.sub('"X-Amzn-Trace-Id": "[^"]+"', '"X-Amzn-Trace-Id": ""', r0_content) ++ r1_content = re.sub('"X-Amzn-Trace-Id": "[^"]+"', '"X-Amzn-Trace-Id": ""', r1_content) ++ # NOTE(jhatler): httpbin.org added "X-Amzn-Trace-Id" to their ++ # response, which is a unique ID that will differ between requests. ++ # We remove it from the response body before comparing. + assert r0_headers == r1_headers +- assert r0.content == r1.content ++ assert r0_content == r1_content + + + class TestRecordNone(IntegrationHelper): diff --git a/meta-python/recipes-devtools/python/python3-betamax/run-ptest b/meta-python/recipes-devtools/python/python3-betamax/run-ptest index b63c4de0d9..7553a6d4bc 100644 --- a/meta-python/recipes-devtools/python/python3-betamax/run-ptest +++ b/meta-python/recipes-devtools/python/python3-betamax/run-ptest @@ -1,3 +1,9 @@ #!/bin/sh +if ! nslookup httpbin.org >/dev/null 2>&1 ; then + trap 'mv /etc/resolv.conf.bak /etc/resolv.conf' INT EXIT + mv /etc/resolv.conf /etc/resolv.conf.bak + echo "nameserver 8.8.8.8" > /etc/resolv.conf +fi + pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb b/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb index 2caeb5afa2..2d5b00e595 100644 --- a/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61c15f0c146c5fb1a8ce8ba2f310d73c" SRC_URI += " \ file://run-ptest \ + file://fix-failing-ptest.patch \ + file://fix-direct-calls-to-test-fixtures.patch \ " SRC_URI[md5sum] = "b8182d43a200fc126a3bf7555626f964" -- cgit v1.2.3-54-g00ecf