X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2FtestHierarchy.py;h=723c6db5b70411863f374e1de3044a30feeb33c0;hb=db88e8be755e4a4c17fcd65eec98ca420eff91a4;hp=a094af03104525c90246b6a08d127a460e62a960;hpb=9f910083686557d1fe8c02a39d8f979731c00c6b;p=sfa.git

diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py
old mode 100644
new mode 100755
index a094af03..723c6db5
--- a/tests/testHierarchy.py
+++ b/tests/testHierarchy.py
@@ -1,7 +1,8 @@
 import unittest
 import os
-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"
@@ -17,23 +18,30 @@ class TestHierarchy(unittest.TestCase):
     def testGetAuthInfo(self):
         h = Hierarchy(BASEDIR)
 
-        auth_info = h.get_auth_info("planetlab.us.arizona.stork", "sa", can_create=True)
+        name = "planetlab.us.arizona.stork"
+
+        self.assertEqual(h.auth_exists(name), False)
+
+        self.assertRaises(MissingAuthority, h.get_auth_info, name)
+
+        h.create_auth(name, create_parents=True)
+        auth_info = h.get_auth_info(name)
         self.assert_(auth_info)
 
         gid = auth_info.get_gid_object()
         self.assert_(gid)
-        self.assertEqual(gid.get_subject(), "planetlab.us.arizona.stork")
+        self.assertEqual(gid.get_subject(), name)
 
         pubkey = auth_info.get_pkey_object()
         self.assert_(gid)
 
         # try to get it again, make sure it's still there
-        auth_info2 = h.get_auth_info("planetlab.us.arizona.stork", "sa", can_create=False)
+        auth_info2 = h.get_auth_info(name)
         self.assert_(auth_info2)
 
         gid = auth_info2.get_gid_object()
         self.assert_(gid)
-        self.assertEqual(gid.get_subject(), "planetlab.us.arizona.stork")
+        self.assertEqual(gid.get_subject(), name)
 
         pubkey = auth_info2.get_pkey_object()
         self.assert_(gid)