diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2016-08-17 23:07:04 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2016-08-17 23:07:04 -0300 |
| commit | e8747096045933754d3f8ac2608cce844f6b0fee (patch) | |
| tree | c64d8545d3971bb7efafeed1a1293b559087daad | |
| parent | dc0bae8b6025a060297b55520674cd7238f0186b (diff) | |
[tests] Adapt tests for ensure_ddocs death
| -rw-r--r-- | testing/tests/couch/common.py | 3 | ||||
| -rw-r--r-- | testing/tests/couch/test_ddocs.py | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/testing/tests/couch/common.py b/testing/tests/couch/common.py index 48d30168..84790059 100644 --- a/testing/tests/couch/common.py +++ b/testing/tests/couch/common.py @@ -17,8 +17,7 @@ def make_couch_database_for_test(test, replica_uid): db = couch.CouchDatabase.open_database( urljoin(test.couch_url, dbname), create=True, - replica_uid=replica_uid or 'test', - ensure_ddocs=True) + replica_uid=replica_uid or 'test') test.addCleanup(test.delete_db, dbname) return db diff --git a/testing/tests/couch/test_ddocs.py b/testing/tests/couch/test_ddocs.py index 2060e27d..3937f2de 100644 --- a/testing/tests/couch/test_ddocs.py +++ b/testing/tests/couch/test_ddocs.py @@ -9,16 +9,16 @@ class CouchDesignDocsTests(CouchDBTestCase): def setUp(self): CouchDBTestCase.setUp(self) + self.create_db() - def create_db(self, ensure=True, dbname=None): + def create_db(self, dbname=None): if not dbname: dbname = ('test-%s' % uuid4().hex) if dbname not in self.couch_server: self.couch_server.create(dbname) self.db = couch.CouchDatabase( (self.couch_url), - dbname, - ensure_ddocs=ensure) + dbname) def tearDown(self): self.db.delete_database() @@ -30,7 +30,6 @@ class CouchDesignDocsTests(CouchDBTestCase): Ensure_security creates a _security ddoc to ensure that only soledad will have the lowest privileged access to an user db. """ - self.create_db(ensure=False) self.assertFalse(self.db._database.resource.get_json('_security')[2]) self.db.ensure_security_ddoc() security_ddoc = self.db._database.resource.get_json('_security')[2] @@ -43,7 +42,6 @@ class CouchDesignDocsTests(CouchDBTestCase): """ Given a configuration, follow it to create the security document """ - self.create_db(ensure=False) configuration = {'members': ['user1', 'user2'], 'members_roles': ['role1', 'role2'], 'admins': ['admin'], |