diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2017-07-12 13:56:08 -0500 |
|---|---|---|
| committer | Paul J. Davis <paul.joseph.davis@gmail.com> | 2017-07-12 16:08:12 -0500 |
| commit | 94f2907ea2d75a08f5dd8dae2edbfc6eea5c6bd7 (patch) | |
| tree | ec321fbf92e2cdf4d6e9c9b2f9c1a2258f0b0ae8 | |
| parent | b95dbb33677ca205897bef90669f686fa4473c2a (diff) | |
| download | couchdb-94f2907ea2d75a08f5dd8dae2edbfc6eea5c6bd7.tar.gz | |
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
| -rw-r--r-- | src/couch/test/couchdb_os_proc_pool.erl | 6 |
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), |