X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2FtestHierarchy.py;h=379d850b4d06a5b2b52350d6ef07487c5255efca;hb=refs%2Fheads%2Fpython3;hp=618c1cdd34dc3324ad84d67a61d506cf9e137065;hpb=5b6247471c0e7868a8ac3fbfdc4c026e62442fa8;p=sfa.git

diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py
old mode 100644
new mode 100755
index 618c1cdd..379d850b
--- a/tests/testHierarchy.py
+++ b/tests/testHierarchy.py
@@ -1,8 +1,8 @@
 import unittest
 import os
-from excep import *
-from hierarchy import *
-from config import *
+from sfa.util.faults import *
+from sfa.trust.hierarchy import *
+from sfa.util.config import *
 
 BASEDIR = "test_hierarchy"
 PURGE_BASEDIR = "rm -rf test_hierarchy"
@@ -26,25 +26,25 @@ class TestHierarchy(unittest.TestCase):
 
         h.create_auth(name, create_parents=True)
         auth_info = h.get_auth_info(name)
-        self.assert_(auth_info)
+        self.assertTrue(auth_info)
 
         gid = auth_info.get_gid_object()
-        self.assert_(gid)
+        self.assertTrue(gid)
         self.assertEqual(gid.get_subject(), name)
 
         pubkey = auth_info.get_pkey_object()
-        self.assert_(gid)
+        self.assertTrue(gid)
 
         # try to get it again, make sure it's still there
         auth_info2 = h.get_auth_info(name)
-        self.assert_(auth_info2)
+        self.assertTrue(auth_info2)
 
         gid = auth_info2.get_gid_object()
-        self.assert_(gid)
+        self.assertTrue(gid)
         self.assertEqual(gid.get_subject(), name)
 
         pubkey = auth_info2.get_pkey_object()
-        self.assert_(gid)
+        self.assertTrue(gid)
 
 
 if __name__ == "__main__":