From: Michal Nowak <mnowak@isc.org>
Date: Tue, 16 Dec 2025 18:03:38 +0000 (+0100)
Subject: Temporarily change pytest.PytestRemovedIn9Warning error to warning
X-Git-Tag: v9.21.17~32^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c5d9c00ef595f81afe8c0c7c2e9ee2128e13284;p=thirdparty%2Fbind9.git

Temporarily change pytest.PytestRemovedIn9Warning error to warning

We need this to be able to use pytest 9.0 from Debian "sid".

Additionally, this error needs to be addressed before pytest 9.1 is
released, as the filter will no longer work. Also, all pytests in CI
images need to be upgraded to version 7, where the new API is supported.

We can't have the "filterwarnings" section in pytest.ini directly as
only pytest 8.0 knows about it.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f302de247a..6603a192d86 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -549,6 +549,10 @@ stages:
     - ( if [ "${CI_DISPOSABLE_ENVIRONMENT}" = "true" ]; then sleep 3000; "$PYTHON" "${CI_PROJECT_DIR}/util/get-running-system-tests.py"; fi ) &
     - cd bin/tests/system
     - RET=0
+    # With pytest 9.0, there's the following error in pytest_ignore_collect():
+    #   The (path: py.path.local) argument is deprecated, please use (collection_path: pathlib.Path).
+    # This should be fixed before pytest 9.1, when it becomes ineffective.
+    - if pytest --version | grep -F "pytest 9.0" >/dev/null; then echo "filterwarnings = ignore::pytest.PytestRemovedIn9Warning" >> pytest.ini; fi
     - >
       ("$PYTEST" --junit-xml="$CI_PROJECT_DIR"/junit.xml -n "$TEST_PARALLEL_JOBS" | tee pytest.out.txt) || RET=1
     - *check_for_junit_xml