diff options
Diffstat (limited to 'common/src/leap/soledad/common/tests/util.py')
| -rw-r--r-- | common/src/leap/soledad/common/tests/util.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/src/leap/soledad/common/tests/util.py b/common/src/leap/soledad/common/tests/util.py index d4439ef4..833d954e 100644 --- a/common/src/leap/soledad/common/tests/util.py +++ b/common/src/leap/soledad/common/tests/util.py @@ -330,6 +330,9 @@ class CouchDBWrapper(object): } handle.close() + shutil.copy('/etc/couchdb/default.ini', self.tempdir) + defaultConfPath = os.path.join(self.tempdir, 'default.ini') + confPath = os.path.join(self.tempdir, 'test.ini') handle = open(confPath, 'w') handle.write(conf) @@ -338,7 +341,7 @@ class CouchDBWrapper(object): # create the dirs from the template mkdir_p(os.path.join(self.tempdir, 'lib')) mkdir_p(os.path.join(self.tempdir, 'log')) - args = ['/usr/bin/couchdb', '-n', '-a', confPath] + args = ['/usr/bin/couchdb', '-n', '-a', defaultConfPath, '-a', confPath] null = open('/dev/null', 'w') self.process = subprocess.Popen( |