summaryrefslogtreecommitdiff
path: root/common/src
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-09-11 19:40:41 -0300
committerVictor Shyba <victor.shyba@gmail.com>2015-09-11 20:03:09 -0300
commita2e0825700c52a63b987286dc8a512fc2dadc7f4 (patch)
treee142cd2fcb990fb9b3bb5518f426448027b54b96 /common/src
parenta5742807539c66577f48d6cfbb411046c17c1978 (diff)
[tests] extract db creation with doc ensure method
This was a duplicate, but also was getting on the way to improve isolation. With this small refactor it should be cleaner and have unique names.
Diffstat (limited to 'common/src')
-rw-r--r--common/src/leap/soledad/common/tests/test_couch.py28
1 files changed, 10 insertions, 18 deletions
diff --git a/common/src/leap/soledad/common/tests/test_couch.py b/common/src/leap/soledad/common/tests/test_couch.py
index 52d1edd4..fb92a290 100644
--- a/common/src/leap/soledad/common/tests/test_couch.py
+++ b/common/src/leap/soledad/common/tests/test_couch.py
@@ -1331,10 +1331,13 @@ class CouchDatabaseExceptionsTests(CouchDBTestCase):
def setUp(self):
CouchDBTestCase.setUp(self)
+
+ def create_db(self, ensure=True):
+ dbname = ('test-%s' % uuid4().hex)
self.db = couch.CouchDatabase.open_database(
- urljoin('http://127.0.0.1:%d' % self.wrapper.port, 'test'),
+ urljoin('http://127.0.0.1:%d' % self.couch_port, dbname),
create=True,
- ensure_ddocs=False) # note that we don't enforce ddocs here
+ ensure_ddocs=ensure)
def tearDown(self):
self.db.delete_database()
@@ -1346,6 +1349,7 @@ class CouchDatabaseExceptionsTests(CouchDBTestCase):
Test that all methods that access design documents will raise if the
design docs are not present.
"""
+ self.create_db(ensure=False)
# _get_generation()
self.assertRaises(
errors.MissingDesignDocError,
@@ -1376,10 +1380,7 @@ class CouchDatabaseExceptionsTests(CouchDBTestCase):
Test that all methods that access design documents list functions
will raise if the functions are not present.
"""
- self.db = couch.CouchDatabase.open_database(
- urljoin('http://127.0.0.1:%d' % self.wrapper.port, 'test'),
- create=True,
- ensure_ddocs=True)
+ self.create_db(ensure=True)
# erase views from _design/transactions
transactions = self.db._database['_design/transactions']
transactions['lists'] = {}
@@ -1406,10 +1407,7 @@ class CouchDatabaseExceptionsTests(CouchDBTestCase):
Test that all methods that access design documents list functions
will raise if the functions are not present.
"""
- self.db = couch.CouchDatabase.open_database(
- urljoin('http://127.0.0.1:%d' % self.wrapper.port, 'test'),
- create=True,
- ensure_ddocs=True)
+ self.create_db(ensure=True)
# erase views from _design/transactions
transactions = self.db._database['_design/transactions']
del transactions['lists']
@@ -1436,10 +1434,7 @@ class CouchDatabaseExceptionsTests(CouchDBTestCase):
Test that all methods that access design documents' named views will
raise if the views are not present.
"""
- self.db = couch.CouchDatabase.open_database(
- urljoin('http://127.0.0.1:%d' % self.wrapper.port, 'test'),
- create=True,
- ensure_ddocs=True)
+ self.create_db(ensure=True)
# erase views from _design/docs
docs = self.db._database['_design/docs']
del docs['views']
@@ -1478,10 +1473,7 @@ class CouchDatabaseExceptionsTests(CouchDBTestCase):
Test that all methods that access design documents will raise if the
design docs are not present.
"""
- self.db = couch.CouchDatabase.open_database(
- urljoin('http://127.0.0.1:%d' % self.wrapper.port, 'test'),
- create=True,
- ensure_ddocs=True)
+ self.create_db(ensure=True)
# delete _design/docs
del self.db._database['_design/docs']
# delete _design/syncs