Merge remote branch 'cloudant:couchdb-3293'

This closes apache#155 Signed-off-by: ILYA Khlopotov <[email protected]>
cloudant · Feb 9, 2017 · 90bd048 · 90bd048
2 parents 928bb2e + cae3664
commit 90bd048
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/test/chttpd_db_bulk_get_test.erl b/test/chttpd_db_bulk_get_test.erl
@@ -19,6 +19,7 @@
 
 
 setup() ->
+    mock(config),
     mock(chttpd),
     mock(couch_epi),
     mock(couch_httpd),
@@ -31,6 +32,7 @@ setup() ->
 
 teardown(Pid) ->
     ok = stop_accumulator(Pid),
+    meck:unload(config),
     meck:unload(chttpd),
     meck:unload(couch_epi),
     meck:unload(couch_httpd),
@@ -270,6 +272,10 @@ mock(couch_stats) ->
     ok;
 mock(fabric) ->
     ok = meck:new(fabric, [passthrough]),
+    ok;
+mock(config) ->
+    ok = meck:new(config, [passthrough]),
+    ok = meck:expect(config, get, fun(_, _, Default) -> Default end),
     ok.