valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-06 16:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get the yz switch tests working and turn them on.

Browse Source
This commit is contained in:
Ted Burghart 2016-07-29 13:46:18 -04:00 committed by Torben Hoffmann
parent 4c56d399cf
commit 29f9eed1bc
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/job_enable_common.erl
View File

@ -300,9 +300,9 @@ test_operation(Node, ?TOKEN_SEC_INDEX, Enabled, ClientType) ->
%% This requires that YZ be running and that
%% riakc_pb_socket:create_search_index(Connection, index_yz())
%% or equivalent has been successfully called before invoking this test.
%% This module's load/data/1 function DOES NOT do this for you.
test_operation(Node, ?TOKEN_YZ_SEARCH, Enabled, ClientType) ->
%% (or equivalent) has been successfully called before invoking this test.
%% This module's load_data/1 function DOES NOT do this for you by default.
test_operation(Node, ?TOKEN_YZ_SEARCH, Enabled, pbc = ClientType) ->
Index = index_yz(),
Bucket = populated_bucket(),
Num = random:uniform(num_keys()),
@ -315,12 +315,29 @@ test_operation(Node, ?TOKEN_YZ_SEARCH, Enabled, ClientType) ->
true ->
?assertMatch({ok, #search_results{}}, Result);
false ->
case ClientType of
pbc ->
?assertEqual({error, ?ERRMSG_YZ_SEARCH_DISABLED}, Result);
http ->
?assertMatch({error, {"403", _}}, Result)
end
?assertEqual({error, ?ERRMSG_YZ_SEARCH_DISABLED}, Result)
end;
test_operation(Node, ?TOKEN_YZ_SEARCH, Enabled, http) ->
% The rhs module's search functions don't do anything remotely like their
% PB equivalents, so this specific test has to depart from the pattern
% entirely.
Bucket = populated_bucket(),
Num = random:uniform(num_keys()),
Key = bin_key(Num),
% more reliable than calling rt:get_https_conn_info directly
RHC = rt:httpc(Node),
URL = lists:flatten([
"http://", rhc:ip(RHC), ":", erlang:integer_to_list(rhc:port(RHC)),
"/search/query/", erlang:binary_to_list(index_yz()),
"?wt=json&q=_yz_rb:", erlang:binary_to_list(Bucket),
"%20AND%20_yz_rk:", erlang:binary_to_list(Key) ]),
Result = ibrowse:send_req(URL, [], get),
case Enabled of
true ->
?assertMatch({ok, "200", _, _}, Result);
false ->
?assertMatch({ok, "403", _, _}, Result)
end.
%% ===================================================================

17
tests/verify_job_enable_rc.erl
View File

@ -33,8 +33,12 @@
?TOKEN_LIST_BUCKETS,
?TOKEN_LIST_KEYS,
?TOKEN_MAP_REDUCE,
?TOKEN_SEC_INDEX
% ?TOKEN_YZ_SEARCH
?TOKEN_SEC_INDEX,
?TOKEN_YZ_SEARCH
]).
-define(COMMON_CONFIG, [
{"storage_backend", "leveldb"}, % required by ?TOKEN_SEC_INDEX above
{"search", "on"} % required by ?TOKEN_YZ_SEARCH above
]).
%% ===================================================================
@ -44,13 +48,18 @@
confirm() ->
Configs = [
{current, {cuttlefish,
[{"storage_backend", "leveldb"}] ++ config(?TEST_OPS, Bool, [])}}
?COMMON_CONFIG ++ config(?TEST_OPS, Bool, [])}}
% make it a 4 node cluster so things get scattered around
% everything's enabled on the trailing nodes
|| Bool <- ?TEST_ORDER ++ [true, true]],
lager:info("Deploying ~b nodes ...", [erlang:length(Configs)]),
Nodes = rt:deploy_nodes(Configs),
[Node | _] = Nodes = rt:deploy_nodes(Configs),
% create the YZ search index
{_, Mod, Conn} = Client = job_enable_common:open_client(pbc, Node),
?assertEqual(ok, Mod:create_search_index(Conn, job_enable_common:index_yz())),
job_enable_common:close_client(Client),
job_enable_common:setup_cluster(Nodes),