From: Martin Basti Date: Mon, 27 Jul 2026 14:51:02 +0000 (+0000) Subject: Drop executable-availability skips from the digdelv tests X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc3eb795b5ac230bc170a11903fa32fb5fdae70b;p=thirdparty%2Fbind9.git Drop executable-availability skips from the digdelv tests The digdelv modules skipped themselves when the tool under test was not built, but dig, delv, mdig, nslookup, host and nsupdate are always built on the main branch, so the guards could never trigger and would only hide genuine breakage as a skip. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/digdelv/tests_delv.py b/bin/tests/system/digdelv/tests_delv.py index 52a845bcc4..43692f08cf 100644 --- a/bin/tests/system/digdelv/tests_delv.py +++ b/bin/tests/system/digdelv/tests_delv.py @@ -15,7 +15,6 @@ Tests for the delv tool. from re import compile as Re -import os import re import pytest @@ -27,10 +26,6 @@ import isctest import isctest.mark pytestmark = [ - pytest.mark.skipif( - not os.access(os.environ.get("DELV", ""), os.X_OK), - reason="delv executable not available", - ), pytest.mark.extra_artifacts(ARTIFACTS), ] diff --git a/bin/tests/system/digdelv/tests_dig.py b/bin/tests/system/digdelv/tests_dig.py index 6f5b62b329..c06c893a1c 100644 --- a/bin/tests/system/digdelv/tests_dig.py +++ b/bin/tests/system/digdelv/tests_dig.py @@ -28,10 +28,6 @@ import isctest import isctest.mark pytestmark = [ - pytest.mark.skipif( - not os.access(os.environ.get("DIG", ""), os.X_OK), - reason="dig executable not available", - ), pytest.mark.extra_artifacts(ARTIFACTS), ] diff --git a/bin/tests/system/digdelv/tests_mdig.py b/bin/tests/system/digdelv/tests_mdig.py index b8fef1bd3d..fb7b433279 100644 --- a/bin/tests/system/digdelv/tests_mdig.py +++ b/bin/tests/system/digdelv/tests_mdig.py @@ -22,10 +22,6 @@ from digdelv.common import ARTIFACTS, parse_yaml import isctest pytestmark = [ - pytest.mark.skipif( - not os.access(os.environ.get("MDIG", ""), os.X_OK), - reason="mdig executable not available", - ), pytest.mark.extra_artifacts(ARTIFACTS), ] diff --git a/bin/tests/system/digdelv/tests_others.py b/bin/tests/system/digdelv/tests_others.py index 3b097c62b2..8f73b09d52 100644 --- a/bin/tests/system/digdelv/tests_others.py +++ b/bin/tests/system/digdelv/tests_others.py @@ -16,8 +16,6 @@ host and nsupdate. from textwrap import dedent -import os - import pytest from digdelv.common import ARTIFACTS @@ -27,10 +25,6 @@ import isctest pytestmark = pytest.mark.extra_artifacts(ARTIFACTS) -@pytest.mark.skipif( - not os.access(os.environ.get("NSLOOKUP", ""), os.X_OK), - reason="nslookup executable not available", -) def test_nslookup_update_response(named_port, ans6): """Check that nslookup rejects a response with the UPDATE opcode.""" nslookup = isctest.run.EnvCmd("NSLOOKUP") @@ -42,10 +36,6 @@ def test_nslookup_update_response(named_port, ans6): assert "Opcode mismatch" in result.out -@pytest.mark.skipif( - not os.access(os.environ.get("HOST", ""), os.X_OK), - reason="host executable not available", -) def test_host_update_response(named_port, ans6): """Check that host rejects a response with the UPDATE opcode.""" host = isctest.run.EnvCmd("HOST") @@ -56,10 +46,6 @@ def test_host_update_response(named_port, ans6): assert "Opcode mismatch" in result.out -@pytest.mark.skipif( - not os.access(os.environ.get("NSUPDATE", ""), os.X_OK), - reason="nsupdate executable not available", -) def test_nsupdate_update_response(named_port, ans6): """Check that nsupdate rejects an UPDATE response to its SOA query.""" nsupdate = isctest.run.EnvCmd("NSUPDATE")