Преглед изворни кода

Add more clean up after tests

[ci skip]
oz123 пре 10 година
родитељ
комит
d235ec3d6a
2 измењених фајлова са 10 додато и 6 уклоњено
  1. 1 1
      pwman/tests/test_init.py
  2. 9 5
      pwman/tests/test_sqlite.py

+ 1 - 1
pwman/tests/test_init.py

@@ -48,7 +48,7 @@ class TestInit(unittest.TestCase):
 
 
     @classmethod
     @classmethod
     def tearDownClass(cls):
     def tearDownClass(cls):
-        for item in ('dummy.cfg'):
+        for item in ('dummy.cfg', testdb):
             try:
             try:
                 os.unlink(item)
                 os.unlink(item)
             except OSError:
             except OSError:

+ 9 - 5
pwman/tests/test_sqlite.py

@@ -26,6 +26,14 @@ from .test_crypto_engine import give_key, DummyCallback
 
 
 class TestSQLite(unittest.TestCase):
 class TestSQLite(unittest.TestCase):
 
 
+    @classmethod
+    def tearDownClass(cls):
+        for item in ('test.db',):
+            try:
+                os.remove(item)
+            except OSError:
+                continue
+
     def setUp(self):
     def setUp(self):
         self.db = SQLite('test.db')
         self.db = SQLite('test.db')
         self.db._open()
         self.db._open()
@@ -157,8 +165,4 @@ if __name__ == '__main__':
     ce = CryptoEngine.get()
     ce = CryptoEngine.get()
     ce.callback = DummyCallback()
     ce.callback = DummyCallback()
     ce.changepassword(reader=give_key)
     ce.changepassword(reader=give_key)
-
-    try:
-        unittest.main(verbosity=2, failfast=True)
-    except SystemExit:
-        os.remove('test.db')
+    unittest.main(verbosity=2, failfast=True)