diff options
Diffstat (limited to 'tests/test_dh.py')
| -rw-r--r-- | tests/test_dh.py | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/tests/test_dh.py b/tests/test_dh.py index 0e66c89..074f154 100644 --- a/tests/test_dh.py +++ b/tests/test_dh.py @@ -4,41 +4,43 @@ Copyright (c) 2000 Ng Pheng Siong. All rights reserved.""" -import unittest -from M2Crypto import DH, BIO, Rand, m2 +from M2Crypto import DH, BIO, Rand +from tests import unittest + class DHTestCase(unittest.TestCase): params = 'tests/dhparam.pem' def genparam_callback(self, *args): - pass + pass def genparam_callback2(self): - pass + pass def test_init_junk(self): - self.assertRaises(TypeError, DH.DH, 'junk') + with self.assertRaises(TypeError): + DH.DH('junk') def test_gen_params(self): a = DH.gen_params(1024, 2, self.genparam_callback) - assert a.check_params() == 0 + self.assertEqual(a.check_params(), 0) def test_gen_params_bad_cb(self): a = DH.gen_params(1024, 2, self.genparam_callback2) - assert a.check_params() == 0 + self.assertEqual(a.check_params(), 0) def test_print_params(self): a = DH.gen_params(1024, 2, self.genparam_callback) bio = BIO.MemoryBuffer() a.print_params(bio) params = bio.read() - assert params.find('(1024 bit)') - assert params.find('generator: 2 (0x2)') + self.assertTrue(params.find(b'(1024 bit)')) + self.assertTrue(params.find(b'generator: 2 (0x2)')) def test_load_params(self): a = DH.load_params('tests/dhparams.pem') - assert a.check_params() == 0 + self.assertEqual(a.check_params(), 0) def test_compute_key(self): a = DH.load_params('tests/dhparams.pem') @@ -47,19 +49,20 @@ class DHTestCase(unittest.TestCase): b.gen_key() ak = a.compute_key(b.pub) bk = b.compute_key(a.pub) - assert ak == bk + self.assertEqual(ak, bk) self.assertEqual(len(a), 128) - self.assertRaises(DH.DHError, setattr, a, 'p', 1) - self.assertRaises(DH.DHError, setattr, a, 'priv', 1) + with self.assertRaises(DH.DHError): + setattr(a, 'p', 1) + with self.assertRaises(DH.DHError): + setattr(a, 'priv', 1) def suite(): return unittest.makeSuite(DHTestCase) -if __name__=='__main__': - Rand.load_file('randpool.dat', -1) +if __name__ == '__main__': + Rand.load_file('randpool.dat', -1) unittest.TextTestRunner().run(suite()) Rand.save_file('randpool.dat') - |