From c3a48a6c2bf8b449a201104b2ef40d6dd975fa6f Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 2 Jan 2019 15:00:21 +0100 Subject: [PATCH] tests/dnssec: don't require pycrypto for make_ds() tests --- tests/test_dnssec.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/test_dnssec.py b/tests/test_dnssec.py index c87862a0..3b4c66e0 100644 --- a/tests/test_dnssec.py +++ b/tests/test_dnssec.py @@ -177,10 +177,6 @@ class DNSSECValidatorTestCase(unittest.TestCase): abs_dnspython_org, when) self.failUnlessRaises(dns.dnssec.ValidationFailure, bad) - def testMakeSHA256DS(self): # type: () -> None - ds = dns.dnssec.make_ds(abs_dnspython_org, sep_key, 'SHA256') - self.failUnless(ds == good_ds) - def testAbsoluteDSAGood(self): # type: () -> None dns.dnssec.validate(abs_dsa_soa, abs_dsa_soa_rrsig, abs_dsa_keys, None, when2) @@ -191,14 +187,6 @@ class DNSSECValidatorTestCase(unittest.TestCase): abs_dsa_keys, None, when2) self.failUnlessRaises(dns.dnssec.ValidationFailure, bad) - def testMakeExampleSHA1DS(self): # type: () -> None - ds = dns.dnssec.make_ds(abs_example, example_sep_key, 'SHA1') - self.failUnless(ds == example_ds_sha1) - - def testMakeExampleSHA256DS(self): # type: () -> None - ds = dns.dnssec.make_ds(abs_example, example_sep_key, 'SHA256') - self.failUnless(ds == example_ds_sha256) - @unittest.skipUnless(dns.dnssec._have_ecdsa, "python ECDSA cannot be imported") def testAbsoluteECDSA256Good(self): # type: () -> None @@ -228,5 +216,20 @@ class DNSSECValidatorTestCase(unittest.TestCase): self.failUnlessRaises(dns.dnssec.ValidationFailure, bad) +class DNSSECMakeDSTestCase(unittest.TestCase): + + def testMakeExampleSHA1DS(self): # type: () -> None + ds = dns.dnssec.make_ds(abs_example, example_sep_key, 'SHA1') + self.failUnless(ds == example_ds_sha1) + + def testMakeExampleSHA256DS(self): # type: () -> None + ds = dns.dnssec.make_ds(abs_example, example_sep_key, 'SHA256') + self.failUnless(ds == example_ds_sha256) + + def testMakeSHA256DS(self): # type: () -> None + ds = dns.dnssec.make_ds(abs_dnspython_org, sep_key, 'SHA256') + self.failUnless(ds == good_ds) + + if __name__ == '__main__': unittest.main() -- 2.47.3