summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-09-16 12:01:20 -0400
committerKali Kaneko <kali@leap.se>2015-09-16 12:01:34 -0400
commit4cb22bcb42b271899c266e30a0ad5e6fd7abd977 (patch)
tree4209196670ecb4c5483ce3c79c145ca001372946 /common/src/leap/soledad
parent8acc8c9058ff5983a78d6df4f66d19de1762cf4d (diff)
parent223f26eb2df3378ce275da2774a7ae923519afa1 (diff)
Merge remote-tracking branch 'leapcode/pr/271' into develop
Diffstat (limited to 'common/src/leap/soledad')
-rw-r--r--common/src/leap/soledad/common/tests/util.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/common/src/leap/soledad/common/tests/util.py b/common/src/leap/soledad/common/tests/util.py
index 41307eb7..1c7adb91 100644
--- a/common/src/leap/soledad/common/tests/util.py
+++ b/common/src/leap/soledad/common/tests/util.py
@@ -345,20 +345,9 @@ class CouchDBTestCase(unittest.TestCase, MockedSharedDBTest):
"""
Make sure we have a CouchDB instance for a test.
"""
- server = self.couch_server = couchdb.Server()
- self.previous_dbs = set([db for db in server])
self.couch_port = 5984
self.couch_url = 'http://localhost:%d' % self.couch_port
-
- def tearDown(self):
- """
- Stop CouchDB instance for test.
- """
- current_dbs = set([db for db in self.couch_server])
- remaining_dbs = current_dbs - self.previous_dbs
- if remaining_dbs:
- raise Exception("tests created %s and didn't clean up!",
- remaining_dbs)
+ self.couch_server = couchdb.Server(self.couch_url)
def delete_db(self, name):
try: