diff options
| author | Jan Lehnardt <jan@apache.org> | 2018-09-15 09:51:30 +0200 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2018-11-09 14:51:33 +0100 |
| commit | c357ff395339bc81eedfd41817054db1de0b03de (patch) | |
| tree | 921431e05e78d24de6c59ec7b52523b80c18bf49 | |
| parent | c3af624b3aa8c6898a1448379dd517173cb6aa6f (diff) | |
| download | couchdb-c357ff395339bc81eedfd41817054db1de0b03de.tar.gz | |
test: fix os proc tests
| -rw-r--r-- | src/chttpd/test/chttpd_view_test.erl | 1 | ||||
| -rw-r--r-- | src/couch/src/couch_proc_manager.erl | 6 | ||||
| -rw-r--r-- | src/couch/test/couchdb_os_proc_pool.erl | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/chttpd/test/chttpd_view_test.erl b/src/chttpd/test/chttpd_view_test.erl index 3457c6f30..6743f31a6 100644 --- a/src/chttpd/test/chttpd_view_test.erl +++ b/src/chttpd/test/chttpd_view_test.erl @@ -31,6 +31,7 @@ setup() -> TmpDb = ?tempdb(), Addr = config:get("chttpd", "bind_address", "127.0.0.1"), Port = mochiweb_socket_server:get(chttpd, port), + os:putenv("COUCHDB_QUERY_SERVER_JAVASCRIPT", "../../..//bin/couchjs ../../..//share/server/main.js"), Url = lists:concat(["http://", Addr, ":", Port, "/", ?b2l(TmpDb)]), create_db(Url), Url. diff --git a/src/couch/src/couch_proc_manager.erl b/src/couch/src/couch_proc_manager.erl index b6639288f..4c11618eb 100644 --- a/src/couch/src/couch_proc_manager.erl +++ b/src/couch/src/couch_proc_manager.erl @@ -394,13 +394,13 @@ get_query_server(LangStr) -> native_query_server_enabled() -> % 1. [native_query_server] enable_erlang_query_server = true | false % 2. if [native_query_server] erlang == {couch_native_process, start_link, []} -> pretend true as well - NativeEnabled = config:get_boolean("native_query_server", "enable_erlang_query_server", false), - NativeLegacyConfig = config:get("native_query_server", "erlang", ""), + NativeEnabled = config:get_boolean("native_query_servers", "enable_erlang_query_server", false), + NativeLegacyConfig = config:get("native_query_servers", "erlang", ""), NativeLegacyEnabled = NativeLegacyConfig =:= "{couch_native_process, start_link, []}", + couch_log:error("~nNativeEnabled: ~p~n", [NativeEnabled]), % there surely is a more elegant way to do this that eludes me at present case {NativeEnabled, NativeLegacyEnabled} of - {true, true} -> true; {true, _} -> true; {_, true} -> true; _ -> false diff --git a/src/couch/test/couchdb_os_proc_pool.erl b/src/couch/test/couchdb_os_proc_pool.erl index 65ae5c54c..69f8051ad 100644 --- a/src/couch/test/couchdb_os_proc_pool.erl +++ b/src/couch/test/couchdb_os_proc_pool.erl @@ -206,8 +206,7 @@ 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("native_query_servers", "enable_erlang_query_server", "true", 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"). @@ -235,7 +234,7 @@ spawn_client() -> Parent = self(), Ref = make_ref(), Pid = spawn(fun() -> - Proc = couch_query_servers:get_os_process(<<"test_lang">>), + Proc = couch_query_servers:get_os_process(<<"erlang">>), loop(Parent, Ref, Proc) end), {Pid, Ref}. @@ -245,7 +244,7 @@ spawn_client(DDocId) -> Ref = make_ref(), Pid = spawn(fun() -> DDocKey = {DDocId, <<"1-abcdefgh">>}, - DDoc = #doc{body={[{<<"language">>, <<"test_lang">>}]}}, + DDoc = #doc{body={[{<<"language">>, <<"erlang">>}]}}, Proc = couch_query_servers:get_ddoc_process(DDoc, DDocKey), loop(Parent, Ref, Proc) end), |