diff options
author | drebs <drebs@leap.se> | 2016-07-25 08:06:39 -0300 |
---|---|---|
committer | drebs <drebs@leap.se> | 2016-07-25 09:19:53 -0300 |
commit | 23fe0be50c7c9408eab47e8286e19b16a77f66ad (patch) | |
tree | 4082476cc8a99806d23b17c3f4cb9d7c9ee412a9 | |
parent | c2849c2f13adfc7c1388de50f41cd234868113ec (diff) |
[test] remove ddocs param from docker setup script
-rwxr-xr-x | scripts/docker/files/bin/setup-test-env.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/docker/files/bin/setup-test-env.py b/scripts/docker/files/bin/setup-test-env.py index c0487e8f..4868fd56 100755 --- a/scripts/docker/files/bin/setup-test-env.py +++ b/scripts/docker/files/bin/setup-test-env.py @@ -194,12 +194,12 @@ def user_db_create(args): url = 'http://localhost:%d/user-%s' % (args.port, args.uuid) try: CouchDatabase.open_database( - url=url, create=False, replica_uid=None, ensure_ddocs=True) + url=url, create=False, replica_uid=None) print '[*] error: database "user-%s" already exists' % args.uuid exit(1) except DatabaseDoesNotExist: CouchDatabase.open_database( - url=url, create=True, replica_uid=None, ensure_ddocs=True) + url=url, create=True, replica_uid=None) print '[+] database created: user-%s' % args.uuid @@ -372,7 +372,10 @@ CERT_CONFIG_FILE = os.path.join( def cert_create(args): private_key = os.path.join(args.basedir, args.private_key) cert_key = os.path.join(args.basedir, args.cert_key) - os.mkdir(args.basedir) + try: + os.mkdir(args.basedir) + except OSError: + pass call([ 'openssl', 'req', |