Switch to test_util:mock(config)
diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl
index 14c763c..0a4299b 100644
--- a/src/chttpd/src/chttpd_db.erl
+++ b/src/chttpd/src/chttpd_db.erl
@@ -2609,7 +2609,7 @@
}.
setup() ->
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
meck:expect(config, get_boolean, fun(_, _, Default) -> Default end),
meck:expect(config, get_float, fun(_, _, Default) -> Default end),
meck:expect(config, get_integer, fun(_, _, Default) -> Default end),
diff --git a/src/couch/src/couch_db.erl b/src/couch/src/couch_db.erl
index 2ef89ce..c64c9bb 100644
--- a/src/couch/src/couch_db.erl
+++ b/src/couch/src/couch_db.erl
@@ -2395,7 +2395,7 @@
meck:new(couch_log, [passthrough]),
meck:new(config, [passthrough]),
meck:new(couch_db_plugin, [passthrough]),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
ok.
teardown_purge_seq(_) ->
diff --git a/src/couch/src/couch_query_servers.erl b/src/couch/src/couch_query_servers.erl
index 151bdc8..442411d 100644
--- a/src/couch/src/couch_query_servers.erl
+++ b/src/couch/src/couch_query_servers.erl
@@ -964,7 +964,7 @@
setup() ->
meck:new(config, [passthrough]),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
ok.
teardown(_) ->
diff --git a/src/couch/src/test_util.erl b/src/couch/src/test_util.erl
index 7ccc26e..684ea22 100644
--- a/src/couch/src/test_util.erl
+++ b/src/couch/src/test_util.erl
@@ -363,7 +363,7 @@
mock(config) ->
meck:new(config, [passthrough]),
meck:expect(config, get, fun(_, _) -> undefined end),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
meck:expect(config, get_boolean, fun(_, _, Default) -> Default end),
meck:expect(config, get_float, fun(_, _, Default) -> Default end),
meck:expect(config, get_integer, fun(_, _, Default) -> Default end),
diff --git a/src/couch_replicator/src/couch_replicator.erl b/src/couch_replicator/src/couch_replicator.erl
index 34c745c..29eec50 100644
--- a/src/couch_replicator/src/couch_replicator.erl
+++ b/src/couch_replicator/src/couch_replicator.erl
@@ -359,7 +359,7 @@
{
setup,
fun() ->
- meck:expect(config, get, fun(_, _, Default) -> Default end)
+ test_util:mock(config)
end,
fun(_) ->
meck:unload()
diff --git a/src/couch_replicator/src/couch_replicator_auth_session.erl b/src/couch_replicator/src/couch_replicator_auth_session.erl
index 31fa0a1..1897d75 100644
--- a/src/couch_replicator/src/couch_replicator_auth_session.erl
+++ b/src/couch_replicator/src/couch_replicator_auth_session.erl
@@ -665,7 +665,7 @@
setup_all() ->
meck:expect(couch_replicator_httpc_pool, get_worker, 1, {ok, worker}),
meck:expect(couch_replicator_httpc_pool, release_worker_sync, 2, ok),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
mock_http_cookie_response("Abc"),
ok.
diff --git a/src/couch_replicator/src/couch_replicator_clustering.erl b/src/couch_replicator/src/couch_replicator_clustering.erl
index 1b41229..b6ed3f7 100644
--- a/src/couch_replicator/src/couch_replicator_clustering.erl
+++ b/src/couch_replicator/src/couch_replicator_clustering.erl
@@ -223,7 +223,7 @@
setup_all() ->
meck:expect(couch_log, notice, 2, ok),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
meck:expect(config, listen_for_changes, 2, ok),
meck:expect(couch_stats, update_gauge, 2, ok),
meck:expect(couch_replicator_notifier, notify, 1, ok).
diff --git a/src/couch_replicator/src/couch_replicator_doc_processor.erl b/src/couch_replicator/src/couch_replicator_doc_processor.erl
index 4e26bdd..0901593 100644
--- a/src/couch_replicator/src/couch_replicator_doc_processor.erl
+++ b/src/couch_replicator/src/couch_replicator_doc_processor.erl
@@ -801,7 +801,7 @@
meck:expect(couch_log, notice, 2, ok),
meck:expect(couch_log, warning, 2, ok),
meck:expect(couch_log, error, 2, ok),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
meck:expect(config, listen_for_changes, 2, ok),
meck:expect(couch_replicator_clustering, owner, 2, node()),
meck:expect(
diff --git a/src/couch_replicator/src/couch_replicator_doc_processor_worker.erl b/src/couch_replicator/src/couch_replicator_doc_processor_worker.erl
index b1014ff..29795ac 100644
--- a/src/couch_replicator/src/couch_replicator_doc_processor_worker.erl
+++ b/src/couch_replicator/src/couch_replicator_doc_processor_worker.erl
@@ -262,7 +262,7 @@
setup() ->
meck:expect(couch_replicator_scheduler, add_job, 1, ok),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
meck:expect(couch_server, get_uuid, 0, this_is_snek),
meck:expect(couch_replicator_docs, update_failed, 3, ok),
meck:expect(couch_replicator_scheduler, rep_state, 1, nil),
diff --git a/src/couch_replicator/src/couch_replicator_parse.erl b/src/couch_replicator/src/couch_replicator_parse.erl
index d5b366d..fdc8f0f 100644
--- a/src/couch_replicator/src/couch_replicator_parse.erl
+++ b/src/couch_replicator/src/couch_replicator_parse.erl
@@ -629,7 +629,7 @@
}.
meck_config() ->
- meck:expect(config, get, fun(_, _, Default) -> Default end).
+ test_util:mock(config).
t_error_on_local_endpoint(_) ->
RepDoc =
diff --git a/src/couch_replicator/src/couch_replicator_scheduler_job.erl b/src/couch_replicator/src/couch_replicator_scheduler_job.erl
index dab8f8a..51b6ec6 100644
--- a/src/couch_replicator/src/couch_replicator_scheduler_job.erl
+++ b/src/couch_replicator/src/couch_replicator_scheduler_job.erl
@@ -1197,7 +1197,7 @@
}.
meck_config() ->
- meck:expect(config, get, fun(_, _, Default) -> Default end).
+ test_util:mock(config).
t_scheduler_job_format_status(_) ->
Source = <<"http://u:p@h1/d1">>,
diff --git a/src/smoosh/src/smoosh_persist.erl b/src/smoosh/src/smoosh_persist.erl
index c1519f6..e960dce 100644
--- a/src/smoosh/src/smoosh_persist.erl
+++ b/src/smoosh/src/smoosh_persist.erl
@@ -142,7 +142,7 @@
{
foreach,
fun() ->
- meck:expect(config, get, fun(_, _, Default) -> Default end)
+ test_util:mock(config)
end,
fun(_) ->
meck:unload()
diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl
index 0ae7590..d104389 100644
--- a/src/smoosh/src/smoosh_server.erl
+++ b/src/smoosh/src/smoosh_server.erl
@@ -569,13 +569,13 @@
Ctx = setup_all_no_mock(),
Pid = list_to_pid("<0.0.0>"),
meck:expect(couch_index_server, get_index, 3, {ok, Pid}),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
Ctx.
setup_all_no_mock() ->
Ctx = test_util:start_couch([couch_log]),
meck:new([config, couch_index, couch_index_server], [passthrough]),
- meck:expect(config, get, fun(_, _, Default) -> Default end),
+ test_util:mock(config),
Ctx.
teardown_all(Ctx) ->
diff --git a/src/smoosh/src/smoosh_utils.erl b/src/smoosh/src/smoosh_utils.erl
index 9a2f590..14b3220 100644
--- a/src/smoosh/src/smoosh_utils.erl
+++ b/src/smoosh/src/smoosh_utils.erl
@@ -162,7 +162,7 @@
foreach,
fun() ->
meck:new(calendar, [passthrough, unstick]),
- meck:expect(config, get, fun(_, _, Default) -> Default end)
+ test_util:mock(config)
end,
fun(_) ->
meck:unload()
