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

Merge pull request #363 from basho/csm-bring-current

Browse Source 
Handle updated partitions resource with n_val information.
This commit is contained in:
Christopher Meiklejohn 2013-08-26 13:58:32 -07:00
commit d3a8010e68
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/riak_control.erl
View File

@ -94,8 +94,8 @@ verify_control({legacy, Node}, _VersionedNodes) ->
verify_resource(Node, "/admin/ring/partitions"),
ok;
verify_control({Vsn, Node}, VersionedNodes) ->
lager:info("Verifying control on node ~p vsn ~p.", [Node, Vsn]),
verify_control({previous, Node}, VersionedNodes) ->
lager:info("Verifying control on node ~p vsn previous.", [Node]),
%% Verify node resource.
{struct,
@ -105,7 +105,22 @@ verify_control({Vsn, Node}, VersionedNodes) ->
%% Verify partitions resource.
{struct,
[{<<"partitions">>, Partitions}]} = verify_resource(Node, "/admin/partitions"),
validate_partitions({Vsn, Node}, Partitions, VersionedNodes),
validate_partitions({previous, Node}, Partitions, VersionedNodes),
ok;
verify_control({current, Node}, VersionedNodes) ->
lager:info("Verifying control on node ~p vsn current.", [Node]),
%% Verify node resource.
{struct,
[{<<"nodes">>, Nodes}]} = verify_resource(Node, "/admin/nodes"),
validate_nodes(Node, Nodes, VersionedNodes, any),
%% Verify partitions resource.
{struct,
[{<<"partitions">>, Partitions},
{<<"default_n_val">>, _}]} = verify_resource(Node, "/admin/partitions"),
validate_partitions({current, Node}, Partitions, VersionedNodes),
ok.
verify_control(VersionedNodes) ->
@ -115,7 +130,7 @@ verify_control(VersionedNodes) ->
verify_resource(Node0, Resource) ->
Node = rt:http_url(Node0),
Output = os:cmd(io_lib:format("curl -s -S ~s~p", [Node, Resource])),
lager:info("Verifying ~p ~p.", [Node, Resource]),
lager:info("Verifying node ~p resource ~p.", [Node, Resource]),
mochijson2:decode(Output).
%% @doc Verify that riak_kv is still running on all nodes.