Skip to content

DO NOT MERGE Don't skip tests if rabbit failed to start #14758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

DO NOT MERGE Don't skip tests if rabbit failed to start #14758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ run_make_dist(Config) ->
Config;
_ ->
global:del_lock(LockId, [node()]),
{skip, "Failed to run \"make test-dist\""}
error("Failed to run \"make test-dist\"")
end;
_ ->
global:del_lock(LockId, [node()]),
Expand Down Expand Up @@ -651,11 +651,11 @@ write_config_file(Config, NodeConfig, _I) ->
{{error, eexist}, ok} ->
NodeConfig;
{{error, Reason}, _} when Reason =/= eexist ->
{skip, "Failed to create Erlang node config directory \"" ++
ConfigDir ++ "\": " ++ file:format_error(Reason)};
error("Failed to create Erlang node config directory \"" ++
ConfigDir ++ "\": " ++ file:format_error(Reason));
{_, {error, Reason}} ->
{skip, "Failed to create Erlang node config file \"" ++
ConfigFile ++ "\": " ++ file:format_error(Reason)}
error("Failed to create Erlang node config file \"" ++
ConfigFile ++ "\": " ++ file:format_error(Reason))
end.

-define(REQUIRED_FEATURE_FLAGS, [
Expand Down Expand Up @@ -847,7 +847,7 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
AbortCmd = ["stop-node" | MakeVars],
_ = rabbit_ct_helpers:make(Config, SrcDir, AbortCmd),
%% @todo Need to stop all nodes in the cluster, not just the one node.
{skip, "Failed to initialize RabbitMQ"}
error("Failed to initialize RabbitMQ")
end;
RunCmd ->
UseSecondary = CanUseSecondary andalso
Expand Down Expand Up @@ -878,7 +878,7 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
_ ->
AbortCmd = ["stop-node" | MakeVars],
_ = rabbit_ct_helpers:exec([RunCmd | AbortCmd]),
{skip, "Failed to initialize RabbitMQ"}
error("Failed to initialize RabbitMQ")
end
end.

Expand Down
Loading