Merge pull request #96 from basho/fix-wait-for-service-only-for-node

Fix wait for service and use in listkeys
This commit is contained in:
engelsanchez 2012-11-26 07:22:51 -08:00
commit 1ce5baaec5
2 changed files with 3 additions and 2 deletions

View File

@ -468,7 +468,7 @@ wait_until_no_pending_changes(Nodes) ->
wait_for_service(Node, Service) ->
F = fun(N) ->
Services = rpc:call(N, riak_core_node_watcher, services, []),
Services = rpc:call(N, riak_core_node_watcher, services, [N]),
lists:member(Service, Services)
end,
?assertEqual(ok, wait_until(Node, F)),

View File

@ -63,7 +63,8 @@ confirm() ->
lager:info("Starting Node ~p", [Prev]),
rt:start(Prev),
rt:wait_until_pingable(Prev),
lager:info("Waiting for riak_kv service to be ready in ~p", [Prev]),
rt:wait_for_service(Prev, riak_kv),
lager:info("Check keys and buckets"),
check_it_all(Nodes -- [Node]),