diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2016-08-17 23:00:34 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2016-08-17 23:05:21 -0300 |
| commit | dc0bae8b6025a060297b55520674cd7238f0186b (patch) | |
| tree | 7567a099e2dcb93c50fbe144d6a227ed65777fa8 /scripts | |
| parent | 29f528927322bb8e3ca326399367c33225b492b5 (diff) | |
[bug] remove misleading ensure_ddoc
ensure_ddoc doesnt make sense anymore as we dont have any ddoc other
than _security, which has its own method for setting. 'ensure_security'
is explicit and is set internally when user is creating a database,
otherwise it will be False as it's only used during creation. This isn't
exposed externally (of couch module) to avoid confusion.
This confusion was making create-user-db fail to create a security ddoc
as it wasn't passing ensure_ddocs=True.
-- Resolves: #8388
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/profiling/mail/couchdb_server.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/profiling/mail/couchdb_server.py b/scripts/profiling/mail/couchdb_server.py index 2cf0a3fd..452f8ec2 100644 --- a/scripts/profiling/mail/couchdb_server.py +++ b/scripts/profiling/mail/couchdb_server.py @@ -18,8 +18,7 @@ def start_couchdb_wrapper(): def get_u1db_database(dbname, port): return CouchDatabase.open_database( 'http://127.0.0.1:%d/%s' % (port, dbname), - True, - ensure_ddocs=True) + True) def create_tokens_database(port, uuid, token_value): @@ -38,5 +37,5 @@ def get_couchdb_wrapper_and_u1db(uuid, token_value): couchdb_u1db = get_u1db_database('user-%s' % uuid, couchdb_wrapper.port) get_u1db_database('shared', couchdb_wrapper.port) create_tokens_database(couchdb_wrapper.port, uuid, token_value) - + return couchdb_wrapper, couchdb_u1db |