From d936fbf05756b40aeb94c595ff48f5e74b07d49c Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 31 Jan 2013 14:18:09 -0200
Subject: Add ability to close Soledad instance.

---
 src/leap/soledad/__init__.py       | 4 ++++
 src/leap/soledad/tests/__init__.py | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/leap/soledad')

diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py
index 2ed1a369..c9c981c2 100644
--- a/src/leap/soledad/__init__.py
+++ b/src/leap/soledad/__init__.py
@@ -41,6 +41,9 @@ class Soledad(object):
         # for symmetric encryption.
         self._db = sqlcipher.open(self.LOCAL_DB_PATH, True, self._secret)
 
+    def close(self):
+        self._db.close()
+
     #-------------------------------------------------------------------------
     # Management of secret for symmetric encryption
     #-------------------------------------------------------------------------
@@ -63,6 +66,7 @@ class Soledad(object):
         try:
             with open(self.SECRET_PATH) as f:
                 self._secret = str(self._gpg.decrypt(f.read()))
+                f.close()
         except IOError:
             raise IOError('Failed to open secret file %s.' % self.SECRET_PATH)
 
diff --git a/src/leap/soledad/tests/__init__.py b/src/leap/soledad/tests/__init__.py
index 890c4d2a..3bb66680 100644
--- a/src/leap/soledad/tests/__init__.py
+++ b/src/leap/soledad/tests/__init__.py
@@ -28,7 +28,9 @@ class BaseSoledadTest(BaseLeapTest):
         self._soledad._gpg.import_keys(PRIVATE_KEY)
 
     def tearDown(self):
-        pass
+        self._db1.close()
+        self._db2.close()
+        self._soledad.close()
 
 
 # Key material for testing
-- 
cgit v1.2.3