Merge pull request #180 from erickt/fix-tests

Fix test 33 by deleting the test database

Author: Roland Hedberg

tests/test_33_identifier.py

@@ -56,7 +56,7 @@ def _eq(l1,l2):
 class TestIdentifier():
     def setup_class(self):
         self.id = IdentDB("subject.db", "example.com", "example")
-        
+
     def test_persistent_1(self):
         policy = Policy({
             "default": {
@@ -67,17 +67,17 @@ def test_persistent_1(self):
                 }
             }
         })
-        
+
         nameid = self.id.construct_nameid("foobar", policy,
                                           "urn:mace:example.com:sp:1")
-        
+
         assert _eq(nameid.keyswv(), ['format', 'text', 'sp_name_qualifier',
                                      'name_qualifier'])
         assert nameid.sp_name_qualifier == "urn:mace:example.com:sp:1"
         assert nameid.format == NAMEID_FORMAT_PERSISTENT
-        
+
         id = self.id.find_local_id(nameid)
-        
+
         assert id == "foobar"
 
     def test_transient_1(self):
@@ -92,12 +92,12 @@ def test_transient_1(self):
         })
         nameid = self.id.construct_nameid("foobar", policy,
                                           "urn:mace:example.com:sp:1")
-        
+
         assert _eq(nameid.keyswv(), ['text', 'format', 'sp_name_qualifier',
                                      'name_qualifier'])
         assert nameid.format == NAMEID_FORMAT_TRANSIENT
         assert nameid.text != "foobar"
-        
+
     def test_vo_1(self):
         policy = Policy({
             "default": {
@@ -108,7 +108,7 @@ def test_vo_1(self):
                 }
             }
         })
-        
+
         name_id_policy = samlp.name_id_policy_from_string(NAME_ID_POLICY_1)
         print name_id_policy
         nameid = self.id.construct_nameid("foobar", policy,
@@ -133,13 +133,13 @@ def test_vo_2(self):
                 }
             }
         })
-        
+
         name_id_policy = samlp.name_id_policy_from_string(NAME_ID_POLICY_2)
-        
+
         nameid = self.id.construct_nameid("foobar", policy,
                                           'http://vo.example.org/design',
                                           name_id_policy)
-        
+
         assert _eq(nameid.keyswv(), ['text', 'sp_name_qualifier', 'format',
                                      'name_qualifier'])
         assert nameid.sp_name_qualifier == 'http://vo.example.org/design'
@@ -172,6 +172,6 @@ def test_transient_nameid(self):
         assert nameid.text.strip() != nameid2.text.strip()
 
     def teardown_class(self):
-        if os.path.exists("foobar.db"):
-            os.unlink("foobar.db")
+        if os.path.exists("subject.db"):
+            os.unlink("subject.db")