From fb327969a71a0bbfd672dd62eb0dede90d7955d1 Mon Sep 17 00:00:00 2001 From: Robert Newson Date: Thu, 17 Oct 2019 16:48:55 +0100 Subject: [PATCH] export get_servers_from_env/1 for ken Also remove the test to detect that background index building didn't happen, cause it does now. --- rebar.config.script | 2 +- src/couch/src/couch_proc_manager.erl | 3 ++- test/javascript/tests/design_docs.js | 11 +---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/rebar.config.script b/rebar.config.script index 75a4a3e7141..960151795b1 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -104,7 +104,7 @@ DepDescs = [ {ioq, "ioq", {tag, "2.1.2"}}, {hqueue, "hqueue", {tag, "1.0.1"}}, {smoosh, "smoosh", {tag, "1.0.1"}}, -{ken, "ken", {tag, "1.0.3"}}, +{ken, "ken", {tag, "1.0.4"}}, %% Non-Erlang deps {docs, {url, "https://github.com/apache/couchdb-documentation"}, diff --git a/src/couch/src/couch_proc_manager.erl b/src/couch/src/couch_proc_manager.erl index 3366b2bca5e..0daef3ee9b2 100644 --- a/src/couch/src/couch_proc_manager.erl +++ b/src/couch/src/couch_proc_manager.erl @@ -21,7 +21,8 @@ get_stale_proc_count/0, new_proc/1, reload/0, - terminate_stale_procs/0 + terminate_stale_procs/0, + get_servers_from_env/1 ]). -export([ diff --git a/test/javascript/tests/design_docs.js b/test/javascript/tests/design_docs.js index 780fc1354e2..29280230109 100644 --- a/test/javascript/tests/design_docs.js +++ b/test/javascript/tests/design_docs.js @@ -252,9 +252,7 @@ couchTests.design_docs = function(debug) { db.bulkSave(makeDocs(1, numDocs + 1)); T(db.ensureFullCommit().ok); - // test that we get correct design doc info back, - // and also that GET /db/_design/test/_info - // hasn't triggered an update of the views + // test that we get correct design doc info back. db.view("test/summate", {stale: "ok"}); // make sure view group's open for (var i = 0; i < 2; i++) { var dinfo = db.designInfo("_design/test"); @@ -263,13 +261,6 @@ couchTests.design_docs = function(debug) { TEquals(prev_view_size, vinfo.sizes.file, "view group disk size didn't change"); TEquals(false, vinfo.compact_running); TEquals(prev_view_sig, vinfo.signature, 'ddoc sig'); - // wait some time (there were issues where an update - // of the views had been triggered in the background) - var start = new Date().getTime(); - while (new Date().getTime() < start + 2000); - TEquals(0, db.view("test/all_docs_twice", {stale: "ok"}).total_rows, 'view info'); - TEquals(0, db.view("test/single_doc", {stale: "ok"}).total_rows, 'view info'); - TEquals(0, db.view("test/summate", {stale: "ok"}).rows.length, 'view info'); T(db.ensureFullCommit().ok); // restartServer(); };