From: Nicki Křížek Date: Mon, 4 Aug 2025 14:30:41 +0000 (+0200) Subject: Use full path for shared test code imports in rollover tests X-Git-Tag: v9.21.11~4^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e49c467efb64229f536f2f116f402da176656ee7;p=thirdparty%2Fbind9.git Use full path for shared test code imports in rollover tests Previously, symlinks and relative directory imports were used in test modules. This caused a name clash when a shared code module "common.py" was introduced for a different test. To avoid the issue, use full paths in imports. --- diff --git a/bin/tests/system/rollover-algo-csk/common.py b/bin/tests/system/rollover-algo-csk/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-algo-csk/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py index a4f518a3f98..9db1f819fae 100644 --- a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py +++ b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py @@ -12,7 +12,7 @@ # pylint: disable=redefined-outer-name,unused-import import isctest -from common import ( +from rollover.common import ( pytestmark, CDSS, DURATION, diff --git a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py index ef1c9842b94..e10d15a5afa 100644 --- a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py +++ b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py @@ -15,7 +15,7 @@ import pytest import isctest from isctest.kasp import KeyTimingMetadata -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-algo-ksk-zsk/common.py b/bin/tests/system/rollover-algo-ksk-zsk/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-algo-ksk-zsk/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py index 914f05d3359..d1e54a05a7b 100644 --- a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py +++ b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py @@ -12,7 +12,7 @@ # pylint: disable=unused-import import isctest -from common import ( +from rollover.common import ( pytestmark, CDSS, DURATION, diff --git a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py index 2eac0cdd3b4..6058780de01 100644 --- a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py +++ b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py @@ -15,7 +15,7 @@ import pytest import isctest from isctest.kasp import KeyTimingMetadata -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-csk-roll1/common.py b/bin/tests/system/rollover-csk-roll1/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-csk-roll1/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py b/bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py index 664d1fef9c2..abf27aca65e 100644 --- a/bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py +++ b/bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py @@ -15,7 +15,7 @@ from datetime import timedelta import isctest from isctest.kasp import Ipub, Iret -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-csk-roll2/common.py b/bin/tests/system/rollover-csk-roll2/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-csk-roll2/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py b/bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py index 6bbe19345c1..1e93dfff7b7 100644 --- a/bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py +++ b/bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py @@ -15,7 +15,7 @@ from datetime import timedelta import isctest from isctest.kasp import Ipub, Iret -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-dynamic2inline/common.py b/bin/tests/system/rollover-dynamic2inline/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-dynamic2inline/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py b/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py index 23accc0941e..5570ce070fb 100644 --- a/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py +++ b/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py @@ -12,7 +12,7 @@ # pylint: disable=redefined-outer-name,unused-import import isctest -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-enable-dnssec/common.py b/bin/tests/system/rollover-enable-dnssec/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-enable-dnssec/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py b/bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py index 544e8d5be05..9c4dd31b85c 100644 --- a/bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py +++ b/bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py @@ -13,7 +13,7 @@ import isctest from isctest.kasp import Ipub, IpubC, Iret -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-going-insecure/common.py b/bin/tests/system/rollover-going-insecure/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-going-insecure/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py index 229fcb7f771..dbfb485c5a9 100644 --- a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py +++ b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py @@ -14,7 +14,7 @@ import pytest import isctest -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py index d20b0e4c0ed..8e74b9bfcff 100644 --- a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py +++ b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py @@ -14,7 +14,7 @@ import pytest import isctest -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-ksk-3crowd/common.py b/bin/tests/system/rollover-ksk-3crowd/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-ksk-3crowd/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py b/bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py index 7891c37fa51..88ca2196a4c 100644 --- a/bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py +++ b/bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py @@ -15,7 +15,7 @@ from datetime import timedelta import isctest from isctest.kasp import KeyTimingMetadata -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-ksk-doubleksk/common.py b/bin/tests/system/rollover-ksk-doubleksk/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-ksk-doubleksk/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py b/bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py index e8a4e6bb189..6a123288926 100644 --- a/bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py +++ b/bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py @@ -14,7 +14,7 @@ from datetime import timedelta import isctest -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-lifetime/common.py b/bin/tests/system/rollover-lifetime/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-lifetime/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py index 29acc4fddd7..55478d86bc0 100644 --- a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py +++ b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py @@ -15,7 +15,7 @@ import pytest import isctest from isctest.util import param -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py index 8d1d92f51d4..76ee89eff37 100644 --- a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py +++ b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py @@ -15,7 +15,7 @@ import pytest import isctest from isctest.util import param -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-multisigner/common.py b/bin/tests/system/rollover-multisigner/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-multisigner/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py b/bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py index 313cd7189ae..2d49ef7cf47 100644 --- a/bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py +++ b/bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py @@ -21,7 +21,7 @@ import dns.update import isctest from isctest.kasp import Iret -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-straight2none/common.py b/bin/tests/system/rollover-straight2none/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-straight2none/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_initial.py b/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_initial.py index fd87d498076..1d5a108d2aa 100644 --- a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_initial.py +++ b/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_initial.py @@ -14,7 +14,7 @@ import pytest import isctest -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py b/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py index 68ce4e134de..a25b8334f6f 100644 --- a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py +++ b/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py @@ -14,7 +14,7 @@ import pytest import isctest -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover-zsk-prepub/common.py b/bin/tests/system/rollover-zsk-prepub/common.py deleted file mode 120000 index 64b8084c5ac..00000000000 --- a/bin/tests/system/rollover-zsk-prepub/common.py +++ /dev/null @@ -1 +0,0 @@ -../rollover/common.py \ No newline at end of file diff --git a/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py b/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py index 726940f24c3..d5550bf509a 100644 --- a/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py +++ b/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py @@ -15,7 +15,7 @@ from datetime import timedelta import isctest from isctest.kasp import Ipub, Iret -from common import ( +from rollover.common import ( pytestmark, alg, size, diff --git a/bin/tests/system/rollover/tests_rollover_manual.py b/bin/tests/system/rollover/tests_rollover_manual.py index 3602329180c..2103fcd7e5f 100644 --- a/bin/tests/system/rollover/tests_rollover_manual.py +++ b/bin/tests/system/rollover/tests_rollover_manual.py @@ -15,7 +15,7 @@ import os import isctest from isctest.kasp import KeyTimingMetadata, Ipub, Iret -from common import pytestmark # pylint: disable=unused-import +from rollover.common import pytestmark # pylint: disable=unused-import def test_rollover_manual(ns3):