Resync tests from master

Author: Brett Hazen

src/riak_test_runner.erl

@@ -391,17 +391,17 @@ test_fun(ConfirmFun, NotifyPid) ->
         %% Store the FSM Pid for use in unported tests
         put(test_runner_fsm, NotifyPid),
         %% Exceptions and their handling sucks, but eunit throws
-            %% errors `erlang:error' so here we are
-            try ConfirmFun() of
-                TestResult ->
-                    ?MODULE:send_event(NotifyPid, test_result(TestResult))
-            catch
-                Error:Reason ->
-                    lager:error("Failed to execute confirm function ~p due to ~p with reason ~p (trace: ~p)", 
-                                [ConfirmFun, Error, Reason, erlang:get_stacktrace()]),
-                    TestResult = format_eunit_error(Reason),
-                    ?MODULE:send_event(NotifyPid, test_result(TestResult))
-            end
+        %% errors `erlang:error' so here we are
+        try ConfirmFun() of
+            TestResult ->
+                ?MODULE:send_event(NotifyPid, test_result(TestResult))
+        catch
+            Error:Reason ->
+                lager:error("Failed to execute confirm function ~p due to ~p with reason ~p (trace: ~p)",
+                            [ConfirmFun, Error, Reason, erlang:get_stacktrace()]),
+                TestResult = format_eunit_error(Reason),
+                ?MODULE:send_event(NotifyPid, test_result(TestResult))
+        end
     end.
 
 format_eunit_error({assertion_failed, InfoList}) ->

tests/pipe_verify_basics.erl

@@ -44,8 +44,6 @@ confirm() ->
 
     [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes],
 
-    [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes],
-
     rt:load_modules_on_nodes([?MODULE], Nodes),
 
     verify_order(Nodes),

tests/pipe_verify_exceptions.erl

@@ -49,8 +49,6 @@ confirm() ->
 
     [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes],
 
-    [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes],
-
     rt:load_modules_on_nodes([?MODULE, rt_pipe], Nodes),
 
     verify_xbad1(Nodes),

tests/pipe_verify_restart_input_forwarding.erl

@@ -56,8 +56,6 @@ confirm() ->
 
     [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes],
 
-    [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),

tests/pipe_verify_sink_types.erl

@@ -43,8 +43,6 @@ confirm() ->
 
     [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes],
 
-    [rt:wait_for_service(Node, riak_pipe) || Node <- Nodes],
-
     verify_raw(Nodes),
     verify_fsm(Nodes),
     verify_fsm_timeout(Nodes),

tests/replication/repl_bucket_types.erl

@@ -429,6 +429,7 @@ value_unchanged(Pid, Bucket, Key, Bin) ->
     end,
     timer:sleep(?ENSURE_READ_INTERVAL).
 
+
 assert_bucket_not_found(Pid, Bucket, Key) ->
     case riakc_pb_socket:get(Pid, Bucket, Key) of
         {error, notfound} ->