mirror of
https://github.com/isc-projects/bind9.git
synced 2026-02-18 18:18:00 -05: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.
This commit is contained in:
parent
cbebeacec1
commit
e49c467efb
32 changed files with 19 additions and 32 deletions
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.py
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
# pylint: disable=redefined-outer-name,unused-import
|
||||
|
||||
import isctest
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
CDSS,
|
||||
DURATION,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import pytest
|
|||
|
||||
import isctest
|
||||
from isctest.kasp import KeyTimingMetadata
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.py
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
# pylint: disable=unused-import
|
||||
|
||||
import isctest
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
CDSS,
|
||||
DURATION,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import pytest
|
|||
|
||||
import isctest
|
||||
from isctest.kasp import KeyTimingMetadata
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.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,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.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,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.py
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
# pylint: disable=redefined-outer-name,unused-import
|
||||
|
||||
import isctest
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.py
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
import isctest
|
||||
from isctest.kasp import Ipub, IpubC, Iret
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.py
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
import pytest
|
||||
|
||||
import isctest
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
import pytest
|
||||
|
||||
import isctest
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.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,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.py
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
from datetime import timedelta
|
||||
|
||||
import isctest
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.py
|
||||
|
|
@ -15,7 +15,7 @@ import pytest
|
|||
|
||||
import isctest
|
||||
from isctest.util import param
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import pytest
|
|||
|
||||
import isctest
|
||||
from isctest.util import param
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.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,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.py
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
import pytest
|
||||
|
||||
import isctest
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
import pytest
|
||||
|
||||
import isctest
|
||||
from common import (
|
||||
from rollover.common import (
|
||||
pytestmark,
|
||||
alg,
|
||||
size,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../rollover/common.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,
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Reference in a new issue