Skip to content

Commit

Permalink
export get_servers_from_env/1 for ken
Browse files Browse the repository at this point in the history
Also remove the test to detect that background index building didn't
happen, cause it does now.
  • Loading branch information
rnewson committed Oct 17, 2019
1 parent 1dd00d6 commit fb32796
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
2 changes: 1 addition & 1 deletion rebar.config.script
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
3 changes: 2 additions & 1 deletion src/couch/src/couch_proc_manager.erl
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down
11 changes: 1 addition & 10 deletions test/javascript/tests/design_docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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();
};
Expand Down

0 comments on commit fb32796

Please sign in to comment.