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

Merge pull request #13717 from rabbitmq/mergify/bp/v4.1.x/pr-13470 

Fix test flakes in various testsuites (backport #13470)
This commit is contained in:
Jean-Sébastien Pédron 2025-04-09 12:48:11 +02:00 committed by GitHub
parent 88c7ad6814 88958f3723
commit 2a70d36710
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbit/test/logging_SUITE.erl vendored
View File

@ -57,7 +57,7 @@
logging_to_syslog_works/1]).
suite() ->
[{timetrap, {minutes, 1}}].
[{timetrap, {minutes, 3}}].
all() ->
[

4
deps/rabbit/test/priority_queue_recovery_SUITE.erl vendored
View File

@ -35,8 +35,10 @@ end_per_suite(Config) ->
rabbit_ct_helpers:run_teardown_steps(Config).
init_per_group(_, Config) ->
Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"),
Config1 = rabbit_ct_helpers:set_config(Config, [
{rmq_nodes_count, 2}
{rmq_nodes_count, 2},
{rmq_nodename_suffix, Suffix}
]),
rabbit_ct_helpers:run_steps(Config1,
rabbit_ct_broker_helpers:setup_steps() ++

7
deps/rabbit_common/mk/rabbitmq-run.mk vendored
View File

@ -323,10 +323,13 @@ start-background-broker: node-tmpdir $(DIST_TARGET)
$(BASIC_SCRIPT_ENV_SETTINGS) \
$(RABBITMQ_SERVER) \
$(REDIRECT_STDIO) &
trap 'test "$$?" = 0 || $(MAKE) stop-node' EXIT && \
ERL_LIBS="$(DIST_ERL_LIBS)" \
$(RABBITMQCTL) -n $(RABBITMQ_NODENAME) wait --timeout $(RMQCTL_WAIT_TIMEOUT) $(RABBITMQ_PID_FILE) && \
ERL_LIBS="$(DIST_ERL_LIBS)" \
$(RABBITMQCTL) --node $(RABBITMQ_NODENAME) await_startup
for i in $$(seq 1 10); do \
ERL_LIBS="$(DIST_ERL_LIBS)" $(RABBITMQCTL) -n $(RABBITMQ_NODENAME) await_startup || sleep 1; \
done && \
ERL_LIBS="$(DIST_ERL_LIBS)" $(RABBITMQCTL) -n $(RABBITMQ_NODENAME) await_startup
start-rabbit-on-node:
$(exec_verbose) ERL_LIBS="$(DIST_ERL_LIBS)" \

17
deps/rabbitmq_mqtt/test/v5_SUITE.erl vendored
View File

@ -206,10 +206,27 @@ end_per_testcase(T, Config) ->
end_per_testcase0(T, Config).
end_per_testcase0(Testcase, Config) ->
%% Terminate all connections and wait for sessions to terminate before
%% starting the next test case.
_ = rabbit_ct_broker_helpers:rpc(
Config, 0,
rabbit_networking, close_all_connections, [<<"test finished">>]),
_ = rabbit_ct_broker_helpers:rpc_all(
Config,
rabbit_mqtt, close_local_client_connections, [normal]),
eventually(?_assertEqual(
[],
rpc(Config, rabbit_mqtt, local_connection_pids, []))),
%% Assert that every testcase cleaned up their MQTT sessions.
rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_queues, []),
eventually(?_assertEqual([], rpc(Config, rabbit_amqqueue, list, []))),
rabbit_ct_helpers:testcase_finished(Config, Testcase).
delete_queues() ->
_ = [catch rabbit_amqqueue:delete(Q, false, false, <<"test finished">>)
|| Q <- rabbit_amqqueue:list()],
ok.
%% -------------------------------------------------------------------
%% Testsuite cases
%% -------------------------------------------------------------------

2
deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java vendored
View File

@ -221,6 +221,7 @@ public class FailureTest {
() -> {
connected.set(false);
try { Thread.sleep(2000); } catch (Exception e) {}
Client locator =
cf.get(new Client.ClientParameters().port(streamPortNode2()));
// wait until there's a new leader
@ -467,6 +468,7 @@ public class FailureTest {
// avoid long-running task in the IO thread
executorService.submit(
() -> {
try { Thread.sleep(2000); } catch (Exception e) {}
Client.StreamMetadata m = metadataClient.metadata(stream).get(stream);
int newReplicaPort = m.getReplicas().get(0).getPort();

5
deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/LeaderLocatorTest.java vendored
View File

@ -28,6 +28,7 @@ import com.rabbitmq.stream.impl.Client.ClientParameters;
import com.rabbitmq.stream.impl.Client.Response;
import com.rabbitmq.stream.impl.Client.StreamMetadata;
import java.util.Collections;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@ -57,7 +58,9 @@ public class LeaderLocatorTest {
void clientLocalLocatorShouldMakeLeaderOnConnectedNode() {
int[] ports = new int[] {TestUtils.streamPortNode1(), TestUtils.streamPortNode2()};
for (int port : ports) {
Client client = cf.get(new Client.ClientParameters().port(port));
Client client = cf.get(new Client.ClientParameters()
.port(port)
.rpcTimeout(Duration.ofSeconds(30)));
String s = UUID.randomUUID().toString();
try {
Response response =