root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

rabbitmq_peer_discovery_{etcd,consul}: Fix error handling if Khepri is unsupported 

[How]
We must check the return value of `rabbit_ct_broker_helpers:run_steps/2`
because it could ask that the testsuite/testgroup/testcase should be
skipped.
This commit is contained in:
Jean-Sébastien Pédron 2024-07-10 14:24:19 +02:00
parent 188241197b
commit e890b9d37f
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
deps/rabbitmq_peer_discovery_consul/test/system_SUITE.erl vendored
View File

@ -78,21 +78,27 @@ init_per_testcase(Testcase, Config)
Config2,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps()),
try
_ = rabbit_ct_broker_helpers:rpc_all(
Config3, rabbit_peer_discovery_backend, api_version, []),
Config3
catch
error:{exception, undef,
[{rabbit_peer_discovery_backend, api_version, _, _} | _]} ->
Config4 = rabbit_ct_helpers:run_steps(
Config3,
rabbit_ct_client_helpers:teardown_steps() ++
rabbit_ct_broker_helpers:teardown_steps()),
rabbit_ct_helpers:testcase_finished(Config4, Testcase),
{skip,
"Some nodes use the old discover->register order; "
"the testcase would likely fail"}
case Config3 of
_ when is_list(Config3) ->
try
_ = rabbit_ct_broker_helpers:rpc_all(
Config3, rabbit_peer_discovery_backend, api_version, []),
Config3
catch
error:{exception, undef,
[{rabbit_peer_discovery_backend, api_version, _, _}
| _]} ->
Config4 = rabbit_ct_helpers:run_steps(
Config3,
rabbit_ct_client_helpers:teardown_steps() ++
rabbit_ct_broker_helpers:teardown_steps()),
rabbit_ct_helpers:testcase_finished(Config4, Testcase),
{skip,
"Some nodes use the old discover->register order; "
"the testcase would likely fail"}
end;
{skip, _} ->
Config3
end;
init_per_testcase(_Testcase, Config) ->
Config.

36
deps/rabbitmq_peer_discovery_etcd/test/system_SUITE.erl vendored
View File

@ -89,21 +89,27 @@ init_per_testcase(Testcase, Config)
Config2,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps()),
try
_ = rabbit_ct_broker_helpers:rpc_all(
Config3, rabbit_peer_discovery_backend, api_version, []),
Config3
catch
error:{exception, undef,
[{rabbit_peer_discovery_backend, api_version, _, _} | _]} ->
Config4 = rabbit_ct_helpers:run_steps(
Config3,
rabbit_ct_client_helpers:teardown_steps() ++
rabbit_ct_broker_helpers:teardown_steps()),
rabbit_ct_helpers:testcase_finished(Config4, Testcase),
{skip,
"Some nodes use the old discover->register order; "
"the testcase would likely fail"}
case Config3 of
_ when is_list(Config3) ->
try
_ = rabbit_ct_broker_helpers:rpc_all(
Config3, rabbit_peer_discovery_backend, api_version, []),
Config3
catch
error:{exception, undef,
[{rabbit_peer_discovery_backend, api_version, _, _}
| _]} ->
Config4 = rabbit_ct_helpers:run_steps(
Config3,
rabbit_ct_client_helpers:teardown_steps() ++
rabbit_ct_broker_helpers:teardown_steps()),
rabbit_ct_helpers:testcase_finished(Config4, Testcase),
{skip,
"Some nodes use the old discover->register order; "
"the testcase would likely fail"}
end;
{skip, _} ->
Config3
end;
init_per_testcase(_Testcase, Config) ->
Config.