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 (symlink)
index 64b8084..0000000
--- 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 a4f518a3f98dce5ced8b362677c7edda2e0d9ef4..9db1f819faede78c23f51d38ea025e17554420c5 100644 (file)
--- 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 ef1c9842b94c8858042bd332e2e876a59ede765a..e10d15a5afae37997e9952813982d9a8a62ca04f 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 914f05d3359b043f416df337e9714125cd95a4a5..d1e54a05a7b10b64b52a761ed01e2f43b5f42b72 100644 (file)
--- 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 2eac0cdd3b4d7ed3a81315bab647fc99e36b9ed1..6058780de01cd97468e78191ab7488f62ab42eec 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 664d1fef9c23a146fff40c4cb7649318ca1a431a..abf27aca65e9114e933a42ff46548c8516a115bf 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 6bbe19345c1109032c1780744ce28883e066189b..1e93dfff7b7a344db5322ad881fc63b30bab947d 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 23accc0941e09ab3a62a926ada484613220a1cc0..5570ce070fb30527c10f85c0443e6edbbd145508 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 544e8d5be05c2257aebb52d743d05d2c109bd50b..9c4dd31b85cb0853e53cc9997c8b205e950d1b51 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 229fcb7f7718360e498d4c145587eaa365a59272..dbfb485c5a973cdf988e18a248f8888a34082370 100644 (file)
--- 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 d20b0e4c0edcb53f54a399f7ca134fa3a757c995..8e74b9bfcffae1a6d5bbcb694d2fc9bec3921a34 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 7891c37fa510e0a34395bc6cf382d32aff718a0f..88ca2196a4c0cf64e9153d6a5b27fab32f3a3d9e 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 e8a4e6bb189038efd8bce731e7ec8f1a08c28a73..6a123288926e0dac3f8cca7e77bb3c2fb2a2145a 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 29acc4fddd771ddd4972aae661d67a42be6a3765..55478d86bc00e22ba96bef0e1f5f1cbc7ff73f19 100644 (file)
--- 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 8d1d92f51d40feca13d898f38b061513d1844fdc..76ee89eff37d6e9995f21fdbf2227da3e8f44053 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 313cd7189ae7365db39f9e66aa51c470533f0272..2d49ef7cf4742f205c5a3cc00a3dfa52d5e55c13 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 fd87d4980763c5e1284ad9c6522604b4c72c7c8e..1d5a108d2aa5ca991447a4df89e593dec659884d 100644 (file)
--- 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 68ce4e134dea96412e2bbf05b2c4e6113431c687..a25b8334f6f6273307524969541c4732ae1dc028 100644 (file)
--- 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 (symlink)
index 64b8084..0000000
--- 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 726940f24c38217f68859050da1d13d2730980f1..d5550bf509ad08dc77ae12d49586b2e3802fa419 100644 (file)
--- 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 3602329180c9b6b24dc30026acc1eab723257e9e..2103fcd7e5f570f57e0f96ead51249d7f3d8a861 100644 (file)
--- 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):