mirror of
https://gitlab.nic.cz/knot/knot-dns.git
synced 2026-06-09 08:33:59 -04:00
tests-extra: fix deprecated use of collections on Ubuntu 22.04, dependency cleanup
This commit is contained in:
parent
342a9b2dd8
commit
339bda58fd
9 changed files with 2 additions and 56 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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":
|
||||
|
|
|
|||
Loading…
Reference in a new issue