Merge branch 'master' into exp2

[sfa.git] / tests / testGid.py

diff --git a/tests/testGid.py b/tests/testGid.py
old mode 100644 (file)
new mode 100755 (executable)
index cec0d92..85f9240
--- a/tests/testGid.py
+++ b/tests/testGid.py
@@ -1,7 +1,7 @@
 import unittest
 import xmlrpclib
-from cert import *
-from gid import *
+from sfa.trust.certificate import Keypair
+from sfa.trust.gid import *
 
 class TestGid(unittest.TestCase):
    def setUp(self):
@@ -16,14 +16,14 @@ class TestGid(unittest.TestCase):
 
    def testSetGetUuid(self):
       gid = GID(subject="test")
-      u = create_uuid()
+      u = uuid.uuid4().int
 
       gid.set_uuid(u)
       self.assertEqual(gid.get_uuid(), u)
 
    def testEncodeDecode(self):
       gid = GID(subject="test")
-      u = str(uuid.uuid4().int)
+      u = uuid.uuid4().int
       hrn = "test.hrn"
 
       gid.set_uuid(u)
@@ -38,7 +38,7 @@ class TestGid(unittest.TestCase):
    def testSaveAndLoadString(self):
       gid = GID(subject="test")
 
-      u = str(uuid.uuid4().int)
+      u = uuid.uuid4().int
       hrn = "test.hrn"
 
       gid.set_uuid(u)