summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-31 14:18:09 -0200
committerdrebs <drebs@leap.se>2013-01-31 15:51:14 -0200
commit02944dc6a5cc1a86273d8737196338224be276d7 (patch)
tree9a665c95149fb60dc776e4b1fb38508072953f7a
parentb25360e22173a56e468b0285bae616491a1b67ca (diff)
Add ability to close Soledad instance.
-rw-r--r--__init__.py4
-rw-r--r--tests/__init__.py4
2 files changed, 7 insertions, 1 deletions
diff --git a/__init__.py b/__init__.py
index 2ed1a369..c9c981c2 100644
--- a/__init__.py
+++ b/__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/tests/__init__.py b/tests/__init__.py
index 890c4d2a..3bb66680 100644
--- a/tests/__init__.py
+++ b/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