summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2017-07-12 13:56:08 -0500
committerPaul J. Davis <paul.joseph.davis@gmail.com>2017-07-12 14:19:42 -0500
commit49f6873db9567107582ad6da523835ebfcc02010 (patch)
treefbc971170c49f8541db657da12f739057f52dc26
parentc5df3b47c65d996f0aa4d7ff6c41651eb50ca463 (diff)
downloadcouchdb-631-fix-os-proc-pool-eunit.tar.gz
Fix couchdb_os_proc_pool eunit timeouts631-fix-os-proc-pool-eunit
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
-rw-r--r--src/couch/test/couchdb_os_proc_pool.erl6
1 files 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),