a little nicer wrt pep8

[sfa.git] / tests / testKeypair.py

diff --git a/tests/testKeypair.py b/tests/testKeypair.py
old mode 100644 (file)
new mode 100755 (executable)
index 6562316..c9254ec
--- a/tests/testKeypair.py
+++ b/tests/testKeypair.py
@@ -1,7 +1,10 @@
+#!/usr/bin/env python3
+import sys
+sys.path.append('..')
+
 import unittest
-import xmlrpclib
 import base64
-from cert import *
+from sfa.trust.certificate import Keypair
 
 class TestKeypair(unittest.TestCase):
    def setUp(self):
@@ -22,19 +25,19 @@ class TestKeypair(unittest.TestCase):
 
       self.assertEqual(k.as_pem(), k2.as_pem())
 
-   def test_get_m2_pkey(self):
+   def test_get_m2_pubkey(self):
       k = Keypair()
       k.create()
 
-      m2 = k.get_m2_pkey()
-      self.assert_(m2 != None)
+      m2 = k.get_m2_pubkey()
+      self.assertTrue(m2 != None)
 
    def test_get_openssl_pkey(self):
       k = Keypair()
       k.create()
 
       pk = k.get_openssl_pkey()
-      self.assert_(pk != None)
+      self.assertTrue(pk != None)
 
    def test_sign_verify(self):
       k = Keypair()
@@ -43,7 +46,7 @@ class TestKeypair(unittest.TestCase):
       data = "this is a test"
       sig = k.sign_string(data)
 
-      print k.verify_string(data, sig)
+      print(k.verify_string(data, sig))
 
 if __name__ == "__main__":
     unittest.main()