Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dnsviz/dnsviz.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCasey Deccio <casey@deccio.net>2020-11-07 02:48:16 +0300
committerCasey Deccio <casey@deccio.net>2020-11-07 02:48:16 +0300
commitf5b07e142e18217513aaad5959671f50fd1c6669 (patch)
treebbd3f61d8aefec6cfb0f22a61bb21144b65827e1 /tests
parent358166c756d9e1b80346146f1f69ad0eb339b572 (diff)
Add python2 backwards compatibility
Diffstat (limited to 'tests')
-rw-r--r--tests/dnsviz_probe_tests.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/dnsviz_probe_tests.py b/tests/dnsviz_probe_tests.py
index 7c3afb6..6ad748d 100644
--- a/tests/dnsviz_probe_tests.py
+++ b/tests/dnsviz_probe_tests.py
@@ -594,7 +594,8 @@ ns1.example 0 IN A 192.0.2.1
arghelper1.aggregate_delegation_info()
zone_to_serve = arghelper1._zones_to_serve[0]
zone_obj = dns.zone.from_file(zone_to_serve.filename, dns.name.from_text('com'))
- self.assertEqual(zone_contents1, zone_obj.to_text())
+ zone_obj_other = dns.zone.from_text(zone_contents1, dns.name.from_text('com'))
+ self.assertEqual(zone_obj, zone_obj_other)
self.assertEqual(arghelper1.explicit_delegations, explicit_delegations1)
self.assertEqual(arghelper1.odd_ports, odd_ports1)
@@ -605,7 +606,8 @@ ns1.example 0 IN A 192.0.2.1
arghelper2.aggregate_delegation_info()
zone_to_serve = arghelper2._zones_to_serve[0]
zone_obj = dns.zone.from_file(zone_to_serve.filename, dns.name.from_text('com'))
- self.assertEqual(zone_contents2, zone_obj.to_text())
+ zone_obj_other = dns.zone.from_text(zone_contents2, dns.name.from_text('com'))
+ self.assertEqual(zone_obj, zone_obj_other)
self.assertEqual(arghelper2.explicit_delegations, explicit_delegations2)
self.assertEqual(arghelper2.odd_ports, odd_ports2)
@@ -933,7 +935,7 @@ ns1.example 0 IN A 192.0.2.1
self.assertEqual(list(arghelper.names), [dns.name.from_text('example.com'), dns.name.from_text('example.net')])
with tempfile.NamedTemporaryFile('wb', prefix='dnsviz', delete=False) as names_file:
- names_file.write(b'example.com\nexample.net\n')
+ names_file.write('example.com\nexample.net\n'.encode('utf-8'))
with tempfile.NamedTemporaryFile('wb', prefix='dnsviz', delete=False) as example_names_only:
example_names_only.write(b'{ "_meta._dnsviz.": { "version": 1.2, "names": [ "example.com.", "example.net.", "example.org." ] } }')