X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2FtestCert.py;h=1d00d274c58dd2242538009a63d1d2ced1200854;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=68b3d11075d78117b58a1031bf96d5a1904700f3;hpb=569614766f80d3b4520424d953eba9b800073218;p=sfa.git

diff --git a/tests/testCert.py b/tests/testCert.py
old mode 100644
new mode 100755
index 68b3d110..1d00d274
--- a/tests/testCert.py
+++ b/tests/testCert.py
@@ -1,6 +1,6 @@
 import unittest
-import xmlrpclib
-from cert import *
+from sfa.trust.certificate import Certificate, Keypair
+from sfa.util.py23 import xmlrpc_client
 
 class TestCert(unittest.TestCase):
    def setUp(self):
@@ -42,7 +42,7 @@ class TestCert(unittest.TestCase):
       # try something a bit more complicated, like an xmlrpc encoding of
       # some parameters
       cert = Certificate(subject="test")
-      data = xmlrpclib.dumps((1, "foo", ["a", "b"], {"c": "d", "e": "f"}, True))
+      data = xmlrpc_client.dumps((1, "foo", ["a", "b"], {"c": "d", "e": "f"}, True))
       cert.set_data(data)
       self.assertEqual(cert.get_data(), data)
 
@@ -112,7 +112,7 @@ class TestCert(unittest.TestCase):
       cert.sign()
 
       result = cert.verify(issuerKey)
-      self.assert_(result)
+      self.assertTrue(result)
 
       # create another key
       issuerKey2 = Keypair(create=True)
@@ -120,14 +120,14 @@ class TestCert(unittest.TestCase):
 
       # and make sure it doesn't verify
       result = cert.verify(issuerKey2)
-      self.assert_(not result)
+      self.assertTrue(not result)
 
       # load the cert from a string, and verify again
       cert2 = Certificate(string = cert.save_to_string())
       result = cert2.verify(issuerKey)
-      self.assert_(result)
+      self.assertTrue(result)
       result = cert2.verify(issuerKey2)
-      self.assert_(not result)
+      self.assertTrue(not result)
 
    def test_is_signed_by(self):
       cert1 = Certificate(subject="one")
@@ -150,9 +150,9 @@ class TestCert(unittest.TestCase):
       cert2.set_issuer(key1, cert=cert1)
 
       # cert2 is signed by cert1
-      self.assert_(cert2.is_signed_by_cert(cert1))
+      self.assertTrue(cert2.is_signed_by_cert(cert1))
       # cert1 is not signed by cert2
-      self.assert_(not cert1.is_signed_by_cert(cert2))
+      self.assertTrue(not cert1.is_signed_by_cert(cert2))
 
    def test_parents(self):
       cert_root = Certificate(subject="root")
@@ -181,18 +181,18 @@ class TestCert(unittest.TestCase):
       cert3.set_parent(cert2)
       cert3.sign()
 
-      self.assert_(cert1.verify(key_root))
-      self.assert_(cert2.is_signed_by_cert(cert1))
-      self.assert_(cert3.is_signed_by_cert(cert2))
+      self.assertTrue(cert1.verify(key_root))
+      self.assertTrue(cert2.is_signed_by_cert(cert1))
+      self.assertTrue(cert3.is_signed_by_cert(cert2))
 
-      self.assert_(cert3.verify_chain([cert_root]))
+      cert3.verify_chain([cert_root])
 
       # now save the chain to a string and load it into a new certificate
       str_chain = cert3.save_to_string(save_parents=True)
       cert4 = Certificate(string = str_chain)
 
       # verify the newly loaded chain still verifies
-      self.assert_(cert4.verify_chain([cert_root]))
+      cert4.verify_chain([cert_root])
 
       # verify the parentage
       self.assertEqual(cert4.get_parent().get_subject(), "two")