diff --git a/tests-extra/tests/dnssec/dnskey_timestamps/test.py b/tests-extra/tests/dnssec/dnskey_timestamps/test.py index 173e25bae..c79e8bbe4 100644 --- a/tests-extra/tests/dnssec/dnskey_timestamps/test.py +++ b/tests-extra/tests/dnssec/dnskey_timestamps/test.py @@ -4,13 +4,6 @@ Check if DNSKEY lifetime timestamps are processed correctly by Knot. """ -import collections -import os -import shutil -import datetime -import subprocess -from subprocess import check_call - from dnstest.utils import * from dnstest.keys import Keymgr from dnstest.test import Test diff --git a/tests-extra/tests/dnssec/ds_push/test.py b/tests-extra/tests/dnssec/ds_push/test.py index 3cd9a711c..6644516f3 100644 --- a/tests-extra/tests/dnssec/ds_push/test.py +++ b/tests-extra/tests/dnssec/ds_push/test.py @@ -4,13 +4,6 @@ Check of automatic KSK rollover with DS push. """ -import collections -import os -import shutil -import datetime -import subprocess -from subprocess import check_call - from dnstest.utils import * from dnstest.keys import Keymgr from dnstest.test import Test diff --git a/tests-extra/tests/dnssec/ds_query/test.py b/tests-extra/tests/dnssec/ds_query/test.py index 5a7a52ed2..401334578 100644 --- a/tests-extra/tests/dnssec/ds_query/test.py +++ b/tests-extra/tests/dnssec/ds_query/test.py @@ -4,14 +4,6 @@ Check of DS query planning. """ -import collections -import os -import random -import shutil -import datetime -import subprocess -from subprocess import check_call - from dnstest.utils import * from dnstest.keys import Keymgr from dnstest.test import Test diff --git a/tests-extra/tests/dnssec/key_rollovers/test.py b/tests-extra/tests/dnssec/key_rollovers/test.py index 51f4b2f23..01182393d 100644 --- a/tests-extra/tests/dnssec/key_rollovers/test.py +++ b/tests-extra/tests/dnssec/key_rollovers/test.py @@ -4,13 +4,7 @@ Check of automatic algorithm rollover scenario. """ -import collections -import os import random -import shutil -import datetime -import subprocess -from subprocess import check_call from dnstest.utils import * from dnstest.keys import Keymgr diff --git a/tests-extra/tests/dnssec/keytag_conflict/test.py b/tests-extra/tests/dnssec/keytag_conflict/test.py index 52e12abe4..41c0ae811 100644 --- a/tests-extra/tests/dnssec/keytag_conflict/test.py +++ b/tests-extra/tests/dnssec/keytag_conflict/test.py @@ -4,12 +4,7 @@ Check if keytag conflict is correctly handled by Knot. """ -import collections -import os import shutil -import datetime -import subprocess -from subprocess import check_call from dnstest.utils import * from dnstest.keys import Keymgr diff --git a/tests-extra/tests/dnssec/ksk_rollover/test.py b/tests-extra/tests/dnssec/ksk_rollover/test.py index 7937a44a3..f1e3c4c13 100644 --- a/tests-extra/tests/dnssec/ksk_rollover/test.py +++ b/tests-extra/tests/dnssec/ksk_rollover/test.py @@ -6,14 +6,6 @@ More precise check of simple KSK rollover. The key_rollovers test is too over-complicated already, unable to add test cases. """ -import collections -import os -import random -import shutil -import datetime -import subprocess -from subprocess import check_call - from dnstest.utils import * from dnstest.keys import Keymgr from dnstest.test import Test diff --git a/tests-extra/tests/dnssec/offline_ksk/test.py b/tests-extra/tests/dnssec/offline_ksk/test.py index 48ae9180f..ec85606d1 100644 --- a/tests-extra/tests/dnssec/offline_ksk/test.py +++ b/tests-extra/tests/dnssec/offline_ksk/test.py @@ -4,14 +4,7 @@ Test of offline signing using KSR and SKR with pre-planned KSK rollover and automatic ZSK rollover. """ -import collections -import os -import shutil -import datetime -import subprocess -import time import random -from subprocess import check_call from dnstest.utils import * from dnstest.keys import Keymgr diff --git a/tests-extra/tests/modules/onlinesign_rollovers/test.py b/tests-extra/tests/modules/onlinesign_rollovers/test.py index 36ea5e510..6b91c00da 100644 --- a/tests-extra/tests/modules/onlinesign_rollovers/test.py +++ b/tests-extra/tests/modules/onlinesign_rollovers/test.py @@ -4,13 +4,7 @@ Check of automatic algorithm rollover scenario. """ -import collections -import os -import shutil -import datetime import random -import subprocess -from subprocess import check_call from dnstest.utils import * from dnstest.keys import Keymgr diff --git a/tests-extra/tools/dnstest/response.py b/tests-extra/tools/dnstest/response.py index 256e6e1b6..8df538fec 100644 --- a/tests-extra/tools/dnstest/response.py +++ b/tests-extra/tools/dnstest/response.py @@ -2,7 +2,7 @@ import binascii import dns.name -import collections +import collections.abc import itertools from dnstest.utils import * @@ -295,7 +295,7 @@ class Response(object): rtype = dns.rdatatype.from_text(rtype) cnt = 0 - if isinstance(self.resp, collections.Iterable): + if isinstance(self.resp, collections.abc.Iterable): self.resp, iter_copy = itertools.tee(self.resp) for msg in iter_copy: if not section or section == "answer":