tests-extra: fix deprecated use of collections on Ubuntu 22.04, dependency cleanup

diff --git a/tests-extra/tests/dnssec/dnskey_timestamps/test.py b/tests-extra/tests/dnssec/dnskey_timestamps/test.py
index 173e25bae37821105c177d2ea663ce6ab7640791..c79e8bbe409f367582b95b25500e396ed13b91ed 100644 (file)
--- 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 3cd9a711cf54ebc759360f7f617042d9ea74fe2b..6644516f3aa7df5f3be7b9f1bf87c9fcc7ef4235 100644 (file)
--- 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 5a7a52ed25c7b0d240e86a6d5d819867e08925e8..4013345780da8fdf01ef20066a3b288a4c3f33fc 100644 (file)
--- 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 51f4b2f23be8a825516b7eddf881cc62029a8f4d..01182393db3788fd6dc0c01fd00c36027937772a 100644 (file)
--- 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 52e12abe430475772bd3c673fa7192327477731d..41c0ae811f66916c8d332c27f4e45f46ed71b682 100644 (file)
--- 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 7937a44a3cb1859e42d274b0b75e7718ffd376ef..f1e3c4c13a5145ae60ef22049b778399ef67496c 100644 (file)
--- 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 48ae9180ff9d677310714f27371c25b73cfc391d..ec85606d121a0c2602aa5e8e4e6baad708715c82 100644 (file)
--- 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 36ea5e5103087d4d6e6138258c24069079ac5ff8..6b91c00da618228c1a353c7417bb9181d4e6eded 100644 (file)
--- 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 256e6e1b657f5c66ec71c7e4f24392c66aa9c50e..8df538fec3f306558941a0d8c1ddcd6390b1768b 100644 (file)
--- 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":