Skip to content

Commit c292458

Browse files
committed
Don't skip tests if rabbit failed to start
1 parent 82e0fe0 commit c292458

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ run_make_dist(Config) ->
278278
Config;
279279
_ ->
280280
global:del_lock(LockId, [node()]),
281-
{skip, "Failed to run \"make test-dist\""}
281+
error("Failed to run \"make test-dist\"")
282282
end;
283283
_ ->
284284
global:del_lock(LockId, [node()]),
@@ -651,11 +651,11 @@ write_config_file(Config, NodeConfig, _I) ->
651651
{{error, eexist}, ok} ->
652652
NodeConfig;
653653
{{error, Reason}, _} when Reason =/= eexist ->
654-
{skip, "Failed to create Erlang node config directory \"" ++
655-
ConfigDir ++ "\": " ++ file:format_error(Reason)};
654+
error("Failed to create Erlang node config directory \"" ++
655+
ConfigDir ++ "\": " ++ file:format_error(Reason));
656656
{_, {error, Reason}} ->
657-
{skip, "Failed to create Erlang node config file \"" ++
658-
ConfigFile ++ "\": " ++ file:format_error(Reason)}
657+
error("Failed to create Erlang node config file \"" ++
658+
ConfigFile ++ "\": " ++ file:format_error(Reason))
659659
end.
660660

661661
-define(REQUIRED_FEATURE_FLAGS, [
@@ -847,7 +847,7 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
847847
AbortCmd = ["stop-node" | MakeVars],
848848
_ = rabbit_ct_helpers:make(Config, SrcDir, AbortCmd),
849849
%% @todo Need to stop all nodes in the cluster, not just the one node.
850-
{skip, "Failed to initialize RabbitMQ"}
850+
error("Failed to initialize RabbitMQ")
851851
end;
852852
RunCmd ->
853853
UseSecondary = CanUseSecondary andalso
@@ -878,7 +878,7 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
878878
_ ->
879879
AbortCmd = ["stop-node" | MakeVars],
880880
_ = rabbit_ct_helpers:exec([RunCmd | AbortCmd]),
881-
{skip, "Failed to initialize RabbitMQ"}
881+
error("Failed to initialize RabbitMQ")
882882
end
883883
end.
884884

0 commit comments

Comments
 (0)