From 49f6873db9567107582ad6da523835ebfcc02010 Mon Sep 17 00:00:00 2001 From: "Paul J. Davis" Date: Wed, 12 Jul 2017 13:56:08 -0500 Subject: Fix couchdb_os_proc_pool eunit timeouts There's a theory that the low memory limits on our CI instances are causing the tests spawning JS processes to fail. Given that we don't need them here we can trivially exclude that as a cause of the test failures. Fixes #631 --- src/couch/test/couchdb_os_proc_pool.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/couch/test/couchdb_os_proc_pool.erl b/src/couch/test/couchdb_os_proc_pool.erl index f14af686d..65ae5c54c 100644 --- a/src/couch/test/couchdb_os_proc_pool.erl +++ b/src/couch/test/couchdb_os_proc_pool.erl @@ -206,6 +206,8 @@ should_reduce_pool_on_idle_os_procs() -> setup_config() -> + MFA = "{couch_native_process, start_link, []}", + config:set("native_query_servers", "test_lang", MFA, false), config:set("query_server_config", "os_process_limit", "3", false), config:set("query_server_config", "os_process_soft_limit", "2", false), ok = confirm_config("os_process_soft_limit", "2"). @@ -233,7 +235,7 @@ spawn_client() -> Parent = self(), Ref = make_ref(), Pid = spawn(fun() -> - Proc = couch_query_servers:get_os_process(<<"javascript">>), + Proc = couch_query_servers:get_os_process(<<"test_lang">>), loop(Parent, Ref, Proc) end), {Pid, Ref}. @@ -243,7 +245,7 @@ spawn_client(DDocId) -> Ref = make_ref(), Pid = spawn(fun() -> DDocKey = {DDocId, <<"1-abcdefgh">>}, - DDoc = #doc{body={[]}}, + DDoc = #doc{body={[{<<"language">>, <<"test_lang">>}]}}, Proc = couch_query_servers:get_ddoc_process(DDoc, DDocKey), loop(Parent, Ref, Proc) end), -- cgit v1.2.1