diff options
| -rwxr-xr-x | server/pkg/create-user-db | 2 | ||||
| -rw-r--r-- | testing/test_soledad/util.py | 3 | ||||
| -rw-r--r-- | testing/tests/couch/test_atomicity.py | 3 | ||||
| -rw-r--r-- | testing/tests/couch/test_backend.py | 3 | ||||
| -rw-r--r-- | testing/tests/server/test_server.py | 3 | ||||
| -rw-r--r-- | testing/tests/sync/test_sync.py | 3 | ||||
| -rw-r--r-- | testing/tests/sync/test_sync_mutex.py | 3 |
7 files changed, 7 insertions, 13 deletions
diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index 5e48d4de..b955b4c3 100755 --- a/server/pkg/create-user-db +++ b/server/pkg/create-user-db @@ -80,7 +80,7 @@ def ensure_database(dbname): url = url_for_db(dbname) db_security = CONF['database-security'] db = CouchDatabase.open_database(url=url, create=True, - replica_uid=None, ensure_ddocs=True, + replica_uid=None, database_security=db_security) print ('success! Ensured that database %s exists, with replica_uid: %s' % (db._dbname, db.replica_uid)) diff --git a/testing/test_soledad/util.py b/testing/test_soledad/util.py index 033a55df..02f3859b 100644 --- a/testing/test_soledad/util.py +++ b/testing/test_soledad/util.py @@ -391,8 +391,7 @@ class CouchServerStateForTests(CouchServerState): db = CouchDatabase.open_database( urljoin(self.couch_url, dbname), True, - replica_uid=replica_uid or 'test', - ensure_ddocs=True) + replica_uid=replica_uid or 'test') self.dbs.append(db) return db diff --git a/testing/tests/couch/test_atomicity.py b/testing/tests/couch/test_atomicity.py index aec9c6cf..3badfb19 100644 --- a/testing/tests/couch/test_atomicity.py +++ b/testing/tests/couch/test_atomicity.py @@ -90,8 +90,7 @@ class CouchAtomicityTestCase(CouchDBTestCase, TestCaseWithServer): self.db = CouchDatabase.open_database( urljoin(self.couch_url, 'user-' + self.user), create=True, - replica_uid='replica', - ensure_ddocs=True) + replica_uid='replica') self.tempdir = tempfile.mkdtemp(prefix="leap_tests-") self.startTwistedServer() diff --git a/testing/tests/couch/test_backend.py b/testing/tests/couch/test_backend.py index f178e8a5..c399338e 100644 --- a/testing/tests/couch/test_backend.py +++ b/testing/tests/couch/test_backend.py @@ -43,8 +43,7 @@ class TestCouchBackendImpl(CouchDBTestCase): 'http://localhost:' + str(self.couch_port), ('test-%s' % uuid4().hex) ), - create=True, - ensure_ddocs=True) + create=True) doc_id1 = db._allocate_doc_id() self.assertTrue(doc_id1.startswith('D-')) self.assertEqual(34, len(doc_id1)) diff --git a/testing/tests/server/test_server.py b/testing/tests/server/test_server.py index b99d1939..49d25ed0 100644 --- a/testing/tests/server/test_server.py +++ b/testing/tests/server/test_server.py @@ -391,8 +391,7 @@ class EncryptedSyncTestCase( # ensure remote db exists before syncing db = CouchDatabase.open_database( urljoin(self.couch_url, 'user-' + user), - create=True, - ensure_ddocs=True) + create=True) def _db1AssertEmptyDocList(results): _, doclist = results diff --git a/testing/tests/sync/test_sync.py b/testing/tests/sync/test_sync.py index 095884ce..5540b7cb 100644 --- a/testing/tests/sync/test_sync.py +++ b/testing/tests/sync/test_sync.py @@ -101,8 +101,7 @@ class InterruptableSyncTestCase( # ensure remote db exists before syncing db = couch.CouchDatabase.open_database( urljoin(self.couch_url, 'user-user-uuid'), - create=True, - ensure_ddocs=True) + create=True) # create interruptor thread t = _SyncInterruptor(sol, db) diff --git a/testing/tests/sync/test_sync_mutex.py b/testing/tests/sync/test_sync_mutex.py index 787cfee8..261c6485 100644 --- a/testing/tests/sync/test_sync_mutex.py +++ b/testing/tests/sync/test_sync_mutex.py @@ -105,8 +105,7 @@ class TestSyncMutex( # ensure remote db exists before syncing db = CouchDatabase.open_database( urljoin(self.couch_url, 'user-' + self.user), - create=True, - ensure_ddocs=True) + create=True) sol = self._soledad_instance( user=self.user, server_url=self.getURL()) |