From 5c5931b5670ce5c0978aae15c533d8ff4c389b3e Mon Sep 17 00:00:00 2001 From: Alex Berghage Date: Mon, 6 Apr 2015 10:36:06 -0500 Subject: [PATCH] Added explicit wait_for_service riak_pipe on pipe* tests... ... which didn't call the 2-arity version of deploy_nodes. NB the /2 version implicitly waits on whatever services are specified. --- tests/pipe_verify_basics.erl | 2 ++ tests/pipe_verify_examples.erl | 4 +++- tests/pipe_verify_exceptions.erl | 2 ++ tests/pipe_verify_restart_input_forwarding.erl | 2 ++ tests/pipe_verify_sink_types.erl | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/pipe_verify_basics.erl b/tests/pipe_verify_basics.erl index 8859074c..67ea4f5e 100644 --- a/tests/pipe_verify_basics.erl +++ b/tests/pipe_verify_basics.erl @@ -42,6 +42,8 @@ confirm() -> lager:info("Build ~b node cluster", [?NODE_COUNT]), Nodes = rt:build_cluster(?NODE_COUNT), + [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes], + rt:load_modules_on_nodes([?MODULE], Nodes), verify_order(Nodes), diff --git a/tests/pipe_verify_examples.erl b/tests/pipe_verify_examples.erl index a45df700..79aeb07d 100644 --- a/tests/pipe_verify_examples.erl +++ b/tests/pipe_verify_examples.erl @@ -30,7 +30,9 @@ confirm() -> lager:info("Build ~b node cluster", [?NODE_COUNT]), Nodes = rt:build_cluster(?NODE_COUNT), - + + [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes], + verify_example(Nodes), verify_example_transform(Nodes), verify_example_reduce(Nodes), diff --git a/tests/pipe_verify_exceptions.erl b/tests/pipe_verify_exceptions.erl index da83ae9f..fd0b42c5 100644 --- a/tests/pipe_verify_exceptions.erl +++ b/tests/pipe_verify_exceptions.erl @@ -47,6 +47,8 @@ confirm() -> lager:info("Build ~b node cluster", [?NODE_COUNT]), Nodes = rt:build_cluster(?NODE_COUNT), + [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes], + rt:load_modules_on_nodes([?MODULE, rt_pipe], Nodes), verify_xbad1(Nodes), diff --git a/tests/pipe_verify_restart_input_forwarding.erl b/tests/pipe_verify_restart_input_forwarding.erl index a9ae5f56..1df9301a 100644 --- a/tests/pipe_verify_restart_input_forwarding.erl +++ b/tests/pipe_verify_restart_input_forwarding.erl @@ -54,6 +54,8 @@ confirm() -> lager:info("Build ~b node cluster", [?NODE_COUNT]), Nodes = rt:build_cluster(?NODE_COUNT), + [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes], + rt:load_modules_on_nodes([?MODULE, rt_pipe], Nodes), verify_worker_restart_failure_input_forwarding(Nodes), diff --git a/tests/pipe_verify_sink_types.erl b/tests/pipe_verify_sink_types.erl index 52c433b6..32b42d50 100644 --- a/tests/pipe_verify_sink_types.erl +++ b/tests/pipe_verify_sink_types.erl @@ -41,6 +41,8 @@ confirm() -> lager:info("Build ~b node cluster", [?NODE_COUNT]), Nodes = rt:build_cluster(?NODE_COUNT), + [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes], + verify_raw(Nodes), verify_fsm(Nodes), verify_fsm_timeout(Nodes),