git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the workaround for wsdl generator
[sfa.git]
/
tests
/
testHierarchy.py
diff --git
a/tests/testHierarchy.py
b/tests/testHierarchy.py
old mode 100644
(file)
new mode 100755
(executable)
index
a094af0
..
723c6db
--- a/
tests/testHierarchy.py
+++ b/
tests/testHierarchy.py
@@
-1,7
+1,8
@@
import unittest
import os
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"
BASEDIR = "test_hierarchy"
PURGE_BASEDIR = "rm -rf test_hierarchy"
@@
-17,23
+18,30
@@
class TestHierarchy(unittest.TestCase):
def testGetAuthInfo(self):
h = Hierarchy(BASEDIR)
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.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
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=Fals
e)
+ auth_info2 = h.get_auth_info(
nam
e)
self.assert_(auth_info2)
gid = auth_info2.get_gid_object()
self.assert_(gid)
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)
pubkey = auth_info2.get_pkey_object()
self.assert_(gid)