Skip to content

New cluster/handoff CLI coverage #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

New cluster/handoff CLI coverage #711

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6e648f
New cluster/handoff CLI coverage
Dec 12, 2014
a04e59c
Check output with regexp
Jan 7, 2015
b87fece
Add real regex patterns to match on
Jan 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion tests/riak_admin_console_tests.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ cluster_tests(Node) ->
check_admin_cmd(Node, "cluster resize-ring abort"),
check_admin_cmd(Node, "cluster plan"),
check_admin_cmd(Node, "cluster commit"),
check_admin_cmd(Node, "cluster clear").
check_admin_cmd(Node, "cluster clear"),
check_admin_output(Node, "cluster status", "Cluster Status"),
check_admin_output(Node, "cluster partition-count", "partition-count"),
check_admin_output(Node, "cluster partitions", "dev1@127\\.0\\.0\\.1"),
check_admin_output(Node, "cluster partition id=0", "^\\+"),
check_admin_output(Node, "cluster partition index=0", "\\+").

%% riak-admin bucket_type
bucket_tests(Node) ->
Expand Down Expand Up @@ -102,6 +107,11 @@ security_tests(Node) ->
check_admin_cmd(Node, "security print-grants foo"),
check_admin_cmd(Node, "security ciphers foo").

%% handoff commands
riak_admin_handoff_tests(Node) ->
check_admin_output(Node, "handoff summary", "Each cell"),
check_admin_output(Node, "handoff details", "No ongoing").

%% "top level" riak-admin COMMANDS
riak_admin_tests(Node) ->
check_admin_cmd(Node, "join -f [email protected]"),
Expand Down Expand Up @@ -228,6 +238,7 @@ confirm() ->
cluster_tests(Node),
bucket_tests(Node),
security_tests(Node),
riak_admin_handoff_tests(Node),
pass.

check_admin_cmd(Node, Cmd) ->
Expand All @@ -244,3 +255,14 @@ check_admin_cmd_2x(Node, Cmd) ->
lager:info("Testing riak-admin ~s on ~s", [Cmd, Node]),
{ok, Out} = rt:admin(Node, S),
?assertEqual("passpass", Out).

%% Everyone hates regexp but...
check_admin_output(Node, Cmd, Expected) ->
S = string:tokens(Cmd, " "),
lager:info("Testing riak-admin ~s on ~s", [Cmd, Node]),
{ok, Out} = rt:admin(Node, S),
Result = case re:run(Out, Expected) of
nomatch -> "fail";
_ -> "pass"
end,
?assertEqual("pass", Result).