mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 14:35:26 +00:00
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.
(cherry picked from commit e49c467efb
)
This commit is contained in:
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -12,7 +12,7 @@
|
|||||||
# pylint: disable=redefined-outer-name,unused-import
|
# pylint: disable=redefined-outer-name,unused-import
|
||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
CDSS,
|
CDSS,
|
||||||
DURATION,
|
DURATION,
|
||||||
|
@@ -15,7 +15,7 @@ import pytest
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import KeyTimingMetadata
|
from isctest.kasp import KeyTimingMetadata
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -12,7 +12,7 @@
|
|||||||
# pylint: disable=unused-import
|
# pylint: disable=unused-import
|
||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
CDSS,
|
CDSS,
|
||||||
DURATION,
|
DURATION,
|
||||||
|
@@ -15,7 +15,7 @@ import pytest
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import KeyTimingMetadata
|
from isctest.kasp import KeyTimingMetadata
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -15,7 +15,7 @@ from datetime import timedelta
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import Ipub, Iret
|
from isctest.kasp import Ipub, Iret
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -15,7 +15,7 @@ from datetime import timedelta
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import Ipub, Iret
|
from isctest.kasp import Ipub, Iret
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -12,7 +12,7 @@
|
|||||||
# pylint: disable=redefined-outer-name,unused-import
|
# pylint: disable=redefined-outer-name,unused-import
|
||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import Ipub, IpubC, Iret
|
from isctest.kasp import Ipub, IpubC, Iret
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -14,7 +14,7 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -15,7 +15,7 @@ from datetime import timedelta
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import KeyTimingMetadata
|
from isctest.kasp import KeyTimingMetadata
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -14,7 +14,7 @@
|
|||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -15,7 +15,7 @@ import pytest
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.util import param
|
from isctest.util import param
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -15,7 +15,7 @@ import pytest
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.util import param
|
from isctest.util import param
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -21,7 +21,7 @@ import dns.update
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import Iret
|
from isctest.kasp import Iret
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -14,7 +14,7 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
../rollover/common.py
|
|
@@ -15,7 +15,7 @@ from datetime import timedelta
|
|||||||
|
|
||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import Ipub, Iret
|
from isctest.kasp import Ipub, Iret
|
||||||
from common import (
|
from rollover.common import (
|
||||||
pytestmark,
|
pytestmark,
|
||||||
alg,
|
alg,
|
||||||
size,
|
size,
|
||||||
|
@@ -15,7 +15,7 @@ import os
|
|||||||
import isctest
|
import isctest
|
||||||
from isctest.kasp import KeyTimingMetadata, Ipub, Iret
|
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):
|
def test_rollover_manual(ns3):
|
||||||
|
Reference in New Issue
Block a user