diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_exceptions.py | 2 | ||||
| -rw-r--r-- | tests/test_rdtypeanydnskey.py | 18 | ||||
| -rw-r--r-- | tests/test_rdtypeanyloc.py | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index a684ca1..6c4d016 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -20,7 +20,7 @@ from dns.exception import DNSException class FormatedError(DNSException): fmt = "Custom format: {parameter}" - supp_kwargs = set(['parameter']) + supp_kwargs = {'parameter'} class ExceptionTestCase(unittest.TestCase): diff --git a/tests/test_rdtypeanydnskey.py b/tests/test_rdtypeanydnskey.py index 4fea7af..48f8dd1 100644 --- a/tests/test_rdtypeanydnskey.py +++ b/tests/test_rdtypeanydnskey.py @@ -29,27 +29,27 @@ class RdtypeAnyDnskeyTestCase(unittest.TestCase): good_f = 0 from_flags = dns.rdtypes.ANY.DNSKEY.flags_to_text_set(good_f) self.failUnless(from_flags == good_s, - '"%s" != "%s"' % (from_flags, good_s)) + '"{}" != "{}"'.format(from_flags, good_s)) from_set = dns.rdtypes.ANY.DNSKEY.flags_from_text_set(good_s) self.failUnless(from_set == good_f, - '"0x%x" != "0x%x"' % (from_set, good_f)) + '"0x{:x}" != "0x{:x}"'.format(from_set, good_f)) def testFlagsAll(self): # type: () -> None '''Test that all defined flags are recognized.''' - good_s = set(['SEP', 'REVOKE', 'ZONE']) + good_s = {'SEP', 'REVOKE', 'ZONE'} good_f = 0x181 from_flags = dns.rdtypes.ANY.DNSKEY.flags_to_text_set(good_f) self.failUnless(from_flags == good_s, - '"%s" != "%s"' % (from_flags, good_s)) + '"{}" != "{}"'.format(from_flags, good_s)) from_text = dns.rdtypes.ANY.DNSKEY.flags_from_text_set(good_s) self.failUnless(from_text == good_f, - '"0x%x" != "0x%x"' % (from_text, good_f)) + '"0x{:x}" != "0x{:x}"'.format(from_text, good_f)) def testFlagsUnknownToText(self): # type: () -> None '''Test that undefined flags are returned in hexadecimal notation.''' - unk_s = set(['0x8000']) + unk_s = {'0x8000'} flags_s = dns.rdtypes.ANY.DNSKEY.flags_to_text_set(0x8000) - self.failUnless(flags_s == unk_s, '"%s" != "%s"' % (flags_s, unk_s)) + self.failUnless(flags_s == unk_s, '"{}" != "{}"'.format(flags_s, unk_s)) def testFlagsUnknownToFlags(self): # type: () -> None '''Test that conversion from undefined mnemonic raises error.''' @@ -60,9 +60,9 @@ class RdtypeAnyDnskeyTestCase(unittest.TestCase): def testFlagsRRToText(self): # type: () -> None '''Test that RR method returns correct flags.''' rr = dns.rrset.from_text('foo', 300, 'IN', 'DNSKEY', '257 3 8 KEY=')[0] - rr_s = set(['ZONE', 'SEP']) + rr_s = {'ZONE', 'SEP'} flags_s = rr.flags_to_text_set() - self.failUnless(flags_s == rr_s, '"%s" != "%s"' % (flags_s, rr_s)) + self.failUnless(flags_s == rr_s, '"{}" != "{}"'.format(flags_s, rr_s)) if __name__ == '__main__': diff --git a/tests/test_rdtypeanyloc.py b/tests/test_rdtypeanyloc.py index e6936c3..7f5990e 100644 --- a/tests/test_rdtypeanyloc.py +++ b/tests/test_rdtypeanyloc.py @@ -28,7 +28,7 @@ class RdtypeAnyLocTestCase(unittest.TestCase): r2 = dns.rrset.from_text('FOO', 600, 'in', 'loc', '49 11 42.400 N 16 36 29.600 E 227.64m ' '1.00m 10000.00m 10.00m') - self.failUnless(r1 == r2, '"%s" != "%s"' % (r1, r2)) + self.failUnless(r1 == r2, '"{}" != "{}"'.format(r1, r2)) def testEqual2(self): '''Test default values for size, horizontal and vertical precision.''' @@ -39,7 +39,7 @@ class RdtypeAnyLocTestCase(unittest.TestCase): (16, 36, 29, 600, 1), 22764.0, # centimeters 100.0, 1000000.00, 1000.0) # centimeters - self.failUnless(r1 == r2, '"%s" != "%s"' % (r1, r2)) + self.failUnless(r1 == r2, '"{}" != "{}"'.format(r1, r2)) def testEqual3(self): '''Test size, horizontal and vertical precision parsers: 100 cm == 1 m. @@ -51,7 +51,7 @@ class RdtypeAnyLocTestCase(unittest.TestCase): r2 = dns.rrset.from_text('FOO', 600, 'in', 'loc', '49 11 42.400 N 16 36 29.600 E 227.64m ' '2.00m 10.00m 2.00m')[0] - self.failUnless(r1 == r2, '"%s" != "%s"' % (r1, r2)) + self.failUnless(r1 == r2, '"{}" != "{}"'.format(r1, r2)) def testEqual4(self): '''Test size, horizontal and vertical precision parsers without unit. @@ -64,7 +64,7 @@ class RdtypeAnyLocTestCase(unittest.TestCase): r2 = dns.rrset.from_text('FOO', 600, 'in', 'loc', '49 11 42.400 N 16 36 29.600 E 227.64 ' '2 10 2')[0] # meters without explicit unit - self.failUnless(r1 == r2, '"%s" != "%s"' % (r1, r2)) + self.failUnless(r1 == r2, '"{}" != "{}"'.format(r1, r2)) if __name__ == '__main__': unittest.main() |