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

Changed to use string:str/2 as per @jtuple's suggestion

Browse Source
This commit is contained in:
Joe DeVivo 2012-09-07 16:45:47 -07:00
parent 6f1e76a2c0
commit e22ade5596
3 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/riak_test_util.erl
View File

@ -1,23 +0,0 @@
-module(riak_test_util).
-export([contains_substring/2]).
contains_substring(String, Substring) ->
contains_substring(String, Substring, Substring).
contains_substring([], _, _) -> false;
contains_substring([Head|_Tail], [Head], _) -> true;
contains_substring([Head|Tail], [Head|SubTail], Substring) ->
contains_substring(Tail, SubTail, Substring);
contains_substring([_Head|Tail], [_|_], Substring) ->
contains_substring(Tail, Substring, Substring).
-ifdef(TEST).
-include_lib("eunit/include/eunit.hrl").
contains_substring_test() ->
?assert(contains_substring("Hi, I like turtles.", "turtles")),
?assert(contains_substring("Hi, I like turtles.", "turt")),
?assert(contains_substring("Hi, I like turtles.", "I")),
?assertNot(contains_substring("Hi, I like turtles.", "penguins")),
ok.
-endif.

6
src/rt.erl
View File

@ -574,3 +574,9 @@ pmap(F, L) ->
L2 = [receive {pmap, N, R} -> {N,R} end || _ <- L],
{_, L3} = lists:unzip(lists:keysort(1, L2)),
L3.
str(String, Substr) ->
case string:str(String, Substr) of
0 -> false;
_ -> true
end.

34
tests/riaknostic_rt.erl
View File

@ -13,7 +13,7 @@ riaknostic_rt() ->
%% print it to the console and hope for the best.
lager:info("1. Check download message"),
{ok, RiaknosticOut1} = rt:admin(Node1, ["diag"]),
?assert(riak_test_util:contains_substring(RiaknosticOut1, "is not present!")),
?assert(rt:str(RiaknosticOut1, "is not present!")),
%%dut.cmd_output_match('Riak diagnostics utility is not present')
%% Install
@ -26,44 +26,44 @@ riaknostic_rt() ->
%% Execute
lager:info("2b. Check Riaknostic executes"),
{ok, RiaknosticOut2b} = rt:admin(Node1, ["diag"]),
?assertNot(riak_test_util:contains_substring(RiaknosticOut2b, "is not present!")),
?assertNot(riak_test_util:contains_substring(RiaknosticOut2b, "[debug]")),
?assertNot(rt:str(RiaknosticOut2b, "is not present!")),
?assertNot(rt:str(RiaknosticOut2b, "[debug]")),
%% Check usage message
lager:info("3. Run Riaknostic usage message"),
{ok, RiaknosticOut3} = rt:admin(Node1, ["diag", "--help"]),
?assert(riak_test_util:contains_substring(RiaknosticOut3, "Usage: riak-admin")),
?assert(rt:str(RiaknosticOut3, "Usage: riak-admin")),
%% Check commands list
lager:info("4. Run Riaknostic commands list message"),
{ok, RiaknosticOut4} = rt:admin(Node1, ["diag", "--list"]),
?assert(riak_test_util:contains_substring(RiaknosticOut4, "Available diagnostic checks")),
?assert(riak_test_util:contains_substring(RiaknosticOut4, " disk ")),
?assert(riak_test_util:contains_substring(RiaknosticOut4, " dumps ")),
?assert(riak_test_util:contains_substring(RiaknosticOut4, " memory_use ")),
?assert(riak_test_util:contains_substring(RiaknosticOut4, " nodes_connected")),
?assert(riak_test_util:contains_substring(RiaknosticOut4, " ring_membership")),
?assert(riak_test_util:contains_substring(RiaknosticOut4, " ring_preflists ")),
?assert(riak_test_util:contains_substring(RiaknosticOut4, " ring_size ")),
?assert(riak_test_util:contains_substring(RiaknosticOut4, " search ")),
?assert(rt:str(RiaknosticOut4, "Available diagnostic checks")),
?assert(rt:str(RiaknosticOut4, " disk ")),
?assert(rt:str(RiaknosticOut4, " dumps ")),
?assert(rt:str(RiaknosticOut4, " memory_use ")),
?assert(rt:str(RiaknosticOut4, " nodes_connected")),
?assert(rt:str(RiaknosticOut4, " ring_membership")),
?assert(rt:str(RiaknosticOut4, " ring_preflists ")),
?assert(rt:str(RiaknosticOut4, " ring_size ")),
?assert(rt:str(RiaknosticOut4, " search ")),
%% Check log levels
lager:info("5. Run Riaknostic with a different log level"),
{ok, RiaknosticOut5} = rt:admin(Node1, ["diag", "--level", "debug"]),
?assert(riak_test_util:contains_substring(RiaknosticOut5, "[debug]")),
?assert(rt:str(RiaknosticOut5, "[debug]")),
%% Check node conn failure when stopped
lager:info("6. Riaknostic warns of node connection failure when stopped"),
rt:stop(Node1),
{ok, RiaknosticOut6} = rt:admin(Node1, ["diag"]),
?assert(riak_test_util:contains_substring(RiaknosticOut6, "[warning] Could not connect")),
?assert(rt:str(RiaknosticOut6, "[warning] Could not connect")),
%% Check node connection when started
lager:info("7. Riaknostic connects to node when running"),
rt:start(Node1),
{ok, RiaknosticOut7} = rt:admin(Node1, ["diag", "--level", "debug"]),
?assert(riak_test_util:contains_substring(RiaknosticOut7, "[debug] Not connected")),
?assert(riak_test_util:contains_substring(RiaknosticOut7, "[debug] Connected to local Riak node")),
?assert(rt:str(RiaknosticOut7, "[debug] Not connected")),
?assert(rt:str(RiaknosticOut7, "[debug] Connected to local Riak node")),
%% Done!
lager:info("Test riaknostic: PASS"),