summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2017-06-30 11:08:57 +0200
committerJan Lehnardt <jan@apache.org>2017-07-06 10:07:32 +0200
commit8b127f459698958b159feac6d6fc71e98d876198 (patch)
tree9322a709f76dd7f8b964276386f699c03f67bf60
parentcc42357fcb4c59452cc5a55a3ac8a6bc273aca90 (diff)
downloadcouchdb-8b127f459698958b159feac6d6fc71e98d876198.tar.gz
test: expect compaction daemon to be off
-rwxr-xr-xdev/run3
-rw-r--r--src/couch/test/couchdb_compaction_daemon_tests.erl5
2 files changed, 5 insertions, 3 deletions
diff --git a/dev/run b/dev/run
index 8af3ac416..36267ce13 100755
--- a/dev/run
+++ b/dev/run
@@ -188,7 +188,8 @@ def setup_configs(ctx):
"cluster_port": cluster_port,
"backend_port": backend_port,
"fauxton_root": fauxton_root,
- "uuid": "fake_uuid_for_dev"
+ "uuid": "fake_uuid_for_dev",
+ "_default": ""
}
write_config(ctx, node, env)
diff --git a/src/couch/test/couchdb_compaction_daemon_tests.erl b/src/couch/test/couchdb_compaction_daemon_tests.erl
index fdb6654b4..908f1d330 100644
--- a/src/couch/test/couchdb_compaction_daemon_tests.erl
+++ b/src/couch/test/couchdb_compaction_daemon_tests.erl
@@ -23,8 +23,9 @@
start() ->
Ctx = test_util:start_couch(),
- config:set("compaction_daemon", "check_interval", "3", false),
- config:set("compaction_daemon", "min_file_size", "100000", false),
+ ok = config:set("compaction_daemon", "check_interval", "3", false),
+ ok = config:set("compaction_daemon", "min_file_size", "100000", false),
+ ok = config:delete("compactions", "_default", false),
ok = meck:new(?MODS_TO_MOCK, [passthrough]),
Ctx.