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
Merge branch 'nocomponent' into geni-v3
[sfa.git]
/
tests
/
testCred.py
diff --git
a/tests/testCred.py
b/tests/testCred.py
index
32fac4a
..
5a563d6
100755
(executable)
--- a/
tests/testCred.py
+++ b/
tests/testCred.py
@@
-32,7
+32,7
@@
class TestCred(unittest.TestCase):
cred.set_gid_object(gidObject)
self.assertEqual(cred.get_gid_object().get_subject(), gidObject.get_subject())
cred.set_gid_object(gidObject)
self.assertEqual(cred.get_gid_object().get_subject(), gidObject.get_subject())
- cred.set_
lifetime(lifeTime
)
+ cred.set_
expiration(datetime.datetime.utcnow() + datetime.timedelta(seconds=lifeTime)
)
cred.set_privileges(rights)
self.assertEqual(cred.get_privileges().save_to_string(), rights)
cred.set_privileges(rights)
self.assertEqual(cred.get_privileges().save_to_string(), rights)
@@
-81,7
+81,7
@@
class TestCred(unittest.TestCase):
cred = Credential()
cred.set_gid_caller(gidCaller)
cred.set_gid_object(gidObject)
cred = Credential()
cred.set_gid_caller(gidCaller)
cred.set_gid_object(gidObject)
- cred.set_
lifetime(3600
)
+ cred.set_
expiration(datetime.datetime.utcnow() + datetime.timedelta(seconds=3600)
)
cred.set_privileges("embed:1, bind:1")
cred.encode()
cred.set_privileges("embed:1, bind:1")
cred.encode()
@@
-103,7
+103,7
@@
class TestCred(unittest.TestCase):
delegated.set_gid_caller(gidDelegatee)
delegated.set_gid_object(gidObject)
delegated.set_parent(cred)
delegated.set_gid_caller(gidDelegatee)
delegated.set_gid_object(gidObject)
delegated.set_parent(cred)
- delegated.set_
lifetime(600
)
+ delegated.set_
expiration(datetime.datetime.utcnow() + datetime.timedelta(seconds=600)
)
delegated.set_privileges("embed:1, bind:1")
gidCaller.save_to_file("/tmp/caller_gid")
ckeys.save_to_file("/tmp/caller_pkey")
delegated.set_privileges("embed:1, bind:1")
gidCaller.save_to_file("/tmp/caller_gid")
ckeys.save_to_file("/tmp/caller_pkey")
@@
-120,7
+120,7
@@
class TestCred(unittest.TestCase):
backup = Credential(string=delegated.get_xml())
# Test that verify catches an incorrect lifetime
backup = Credential(string=delegated.get_xml())
# Test that verify catches an incorrect lifetime
- delegated.set_
lifetime(6000
)
+ delegated.set_
expiration(datetime.datetime.utcnow() + datetime.timedelta(seconds=6000)
)
delegated.encode()
delegated.sign()
try:
delegated.encode()
delegated.sign()
try: