added hierarchy tests

diff --git a/tests/test.key b/tests/test.key
deleted file mode 100644 (file)
index 4ffe0ff..0000000
--- a/tests/test.key
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDeWX/s21UpBlK0r1AwV8m+sUM7XAcz/X0SMChEwWaqwR0IQF3M
-MuY583stGIiVJtVcMkGoEnz27xMGqeeILgP7R7GBH28RFJWw8dud7P0H2h0OiIoW
-PTyjcYotNsPxzcoK9wns6gH6tNKu8Sy+dcZ+Zbp8SfYfVSCIBR7+VJGrMQIDAQAB
-AoGAaQTIwSyPOoM8CQ9MxqiQJzs+UAkVdd7idfa87kySm0/+0GjmZI4d4302zoPp
-7tiaqaMrE6E32MHusJULQGzLf8AepxiK/KX04lA7CnBlbAjZAHy0XvUpZLvKGx+j
-hwb6VBR72WLUhYKmcjuUgVxfBlWDxSWV5OVC9x/IS4Vs3gkCQQD7LtGepxTlgbKM
-ZT8/MgfhOAyqtaW9CV98TgAlpjUemXrE7nFgJUbtXkWOe5WEG5cutyS0E3h0+Agi
-BVIZQ0JjAkEA4p0fwTTYkGQIJWfbrnBvpxNozTMJ0fU45iSdVJz+18Tw3oclmqbT
-k7+7B7IYUDo456ItPydsiyxiKEc3CxZGWwJBAO5KK0jEnzlfgmBYiNjOANWzk6i7
-bMFaTACkCtWsyQX/eo2q21nn41K6tWgHa/+JITKLQkGnmwX0a9rCi3E18psCQBcS
-B/mTd7i7dljYifToXXWU9EZvu8A0RuanM505nng5BIyjFaD4+vE/w7q01uTUCJcM
-W67iRJqmmhefqGroiaECQQDseGdWAPeQAbZ4XCHVXKVnWLi3PV69yhPOh4U7RgVZ
-F4pumzfgtwHL6347yH0D7hs3NXBti2x4iNDxRFIIgvEB
------END RSA PRIVATE KEY-----

diff --git a/tests/testAll.py b/tests/testAll.py
index c4ac99f..8e08daf 100644 (file)
--- a/tests/testAll.py
+++ b/tests/testAll.py
@@ -3,6 +3,8 @@ from testCert import *
 from testGid import *
 from testCred import *
 from testKeypair import *
+from testMisc import *
+from testHierarchy import *
 #from testRecord import *
 
 if __name__ == "__main__":

diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py
new file mode 100644 (file)
index 0000000..a094af0
--- /dev/null
+++ b/tests/testHierarchy.py
@@ -0,0 +1,43 @@
+import unittest
+import os
+from hierarchy import *
+from config import *
+
+BASEDIR = "test_hierarchy"
+PURGE_BASEDIR = "rm -rf test_hierarchy"
+
+class TestHierarchy(unittest.TestCase):
+    def setUp(self):
+        os.system(PURGE_BASEDIR)
+        pass
+
+    def testInit(self):
+        h = Hierarchy(BASEDIR)
+
+    def testGetAuthInfo(self):
+        h = Hierarchy(BASEDIR)
+
+        auth_info = h.get_auth_info("planetlab.us.arizona.stork", "sa", can_create=True)
+        self.assert_(auth_info)
+
+        gid = auth_info.get_gid_object()
+        self.assert_(gid)
+        self.assertEqual(gid.get_subject(), "planetlab.us.arizona.stork")
+
+        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)
+        self.assert_(auth_info2)
+
+        gid = auth_info2.get_gid_object()
+        self.assert_(gid)
+        self.assertEqual(gid.get_subject(), "planetlab.us.arizona.stork")
+
+        pubkey = auth_info2.get_pkey_object()
+        self.assert_(gid)
+
+
+if __name__ == "__main__":
+    unittest.main()

diff --git a/tests/testRecord.py b/tests/testRecord.py
index 16cdb90..513f95a 100644 (file)
--- a/tests/testRecord.py
+++ b/tests/testRecord.py
@@ -3,6 +3,7 @@ import xmlrpclib
 from record import *
 from cert import *
 from gid import *
+from config import *
 
 class TestRecord(unittest.TestCase):
     def setUp(self):
@@ -14,16 +15,19 @@ class TestRecord(unittest.TestCase):
 class TestTable(unittest.TestCase):
 
     def setUp(self):
+        set_geni_table_prefix("testRecord$")
         self.reg_hrn = "test.table"
         self.rec_hrn = self.reg_hrn + "." + "record"
-        pass
 
-    def testCreate(self):
-        t = GeniTable(hrn = self.reg_hrn)
+    def test000_Purge(self):
+        geni_records_purge(get_default_dbinfo())
+
+    def test001_Create(self):
+        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
         t.create()
 
-    def testInsert(self):
-        t = GeniTable(hrn = self.reg_hrn)
+    def test002_Insert(self):
+        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
 
         k = Keypair(create=True)
         gid = GID(subject="scott.foo", uuid=create_uuid(), hrn=self.rec_hrn)
@@ -35,25 +39,25 @@ class TestTable(unittest.TestCase):
         r = GeniRecord(name=self.rec_hrn, gid=gid.save_to_string(), type="user", pointer=3)
         t.insert(r)
 
-    def testLookup(self):
-        t = GeniTable(hrn = self.reg_hrn)
+    def test003_Lookup(self):
+        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
 
-        rec_list = t.lookup(self.rec_hrn)
+        rec_list = t.resolve("*", self.rec_hrn)
         self.assertEqual(len(rec_list), 1)
         r = rec_list[0]
         self.assertEqual(r.name, self.rec_hrn)
         self.assertEqual(r.pointer, 3)
 
-    def testUpdate(self):
-        t = GeniTable(hrn = self.reg_hrn)
+    def test004_Update(self):
+        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
 
-        rec_list = t.lookup(self.rec_hrn)
+        rec_list = t.resolve("*", self.rec_hrn)
         r = rec_list[0]
 
         r.set_pointer(4)
         t.update(r)
 
-        rec_list = t.lookup(self.rec_hrn)
+        rec_list = t.resolve("*", self.rec_hrn)
         self.assertEqual(len(rec_list), 1)
         r = rec_list[0]
         self.assertEqual(r.name, self.rec_hrn)