summaryrefslogtreecommitdiff
path: root/testing/test_soledad
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-07-08 13:09:26 +0200
committerKali Kaneko <kali@leap.se>2016-07-12 03:09:32 +0200
commitd99198046e07abb0d19fde1695d22267bc5e1433 (patch)
treedc76c4a45f439d45547b58f227853f8365536669 /testing/test_soledad
parent42521e368734d358c3169495003fae32c28da2b1 (diff)
[bug] properly trap db errors and close resources
SQLCipher database access errors can raise Soledad exceptions. Database access and multithreading resources are allocated in different places, so we have to be careful to close all multithreading mechanismis in case of database access errors. If we don't, zombie threads may haunt the reactor. This commit adds SQLCipher exception trapping and Soledad exception raising for database access errors, while properly shutting down multithreading resources.
Diffstat (limited to 'testing/test_soledad')
-rw-r--r--testing/test_soledad/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/test_soledad/util.py b/testing/test_soledad/util.py
index f81001b9..033a55df 100644
--- a/testing/test_soledad/util.py
+++ b/testing/test_soledad/util.py
@@ -313,7 +313,7 @@ class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest):
self.tempdir, prefix, secrets_path),
local_db_path=os.path.join(
self.tempdir, prefix, local_db_path),
- server_url=server_url, # Soledad will fail if not given an url.
+ server_url=server_url, # Soledad will fail if not given an url
cert_file=cert_file,
defer_encryption=self.defer_sync_encryption,
shared_db=MockSharedDB(),