diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-05-16 15:47:24 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-05-16 15:47:24 -0300 |
commit | 5cb40a959af827e4eadde1c047664c4f4c0ae01d (patch) | |
tree | b11f91ee018a23e0afd7be8c1bc74e0c34a1e64b /common/src/leap/soledad/common/tests/u1db_tests/__init__.py | |
parent | ce22976cc0e203e53799e771aa5e3717d498cc5c (diff) | |
parent | 4375c180b3de4eb84603bf15755ae1f7635804fe (diff) |
Merge branch 'release-0.5.1'0.5.1
Diffstat (limited to 'common/src/leap/soledad/common/tests/u1db_tests/__init__.py')
-rw-r--r-- | common/src/leap/soledad/common/tests/u1db_tests/__init__.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/__init__.py b/common/src/leap/soledad/common/tests/u1db_tests/__init__.py index 3bc12487..99ff77b4 100644 --- a/common/src/leap/soledad/common/tests/u1db_tests/__init__.py +++ b/common/src/leap/soledad/common/tests/u1db_tests/__init__.py @@ -208,8 +208,8 @@ class DatabaseBaseTests(TestCase): self.db = self.create_database('test') def tearDown(self): - # TODO: Add close_database parameterization - # self.close_database(self.db) + if hasattr(self, 'db') and self.db is not None: + self.db.close() super(DatabaseBaseTests, self).tearDown() def assertTransactionLog(self, doc_ids, db): @@ -335,6 +335,13 @@ class TestCaseWithServer(TestCase): super(TestCaseWithServer, self).setUp() self.server = self.server_thread = None + def tearDown(self): + if self.server is not None: + self.server.shutdown() + self.server_thread.join() + self.server.server_close() + super(TestCaseWithServer, self).tearDown() + @property def url_scheme(self): return self.server_def()[-1] |