Skip to content

Fix test flakes in various testsuites (backport #13470) (backport #13717) #13719

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

Merged
merged 5 commits into from
Apr 9, 2025
Merged

Fix test flakes in various testsuites (backport #13470) (backport #13717) #13719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d78796
v5_SUITE: Close all connections in `end_per_testcase/2`
dumbbell Mar 3, 2025
df3c9e7
priority_queue_recovery_SUITE: Add suffix to RabbitMQ node names
dumbbell Feb 25, 2025
5af5235
logging_SUITE: Increase timetrap to 3 minutes
dumbbell Mar 3, 2025
3da9903
rabbit_stream_SUITE: Increase some timeouts
dumbbell Feb 27, 2025
a1744a7
rabbitmq-run.mk: Stop node in `start-background-broker` in case of error
dumbbell Feb 26, 2025
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
2 changes: 1 addition & 1 deletion deps/rabbit/test/logging_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
logging_to_syslog_works/1]).

suite() ->
[{timetrap, {minutes, 1}}].
[{timetrap, {minutes, 3}}].

all() ->
[
Expand Down
4 changes: 3 additions & 1 deletion deps/rabbit/test/priority_queue_recovery_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() ++
Expand Down
7 changes: 5 additions & 2 deletions deps/rabbit_common/mk/rabbitmq-run.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,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)" \
Expand Down
17 changes: 17 additions & 0 deletions deps/rabbitmq_mqtt/test/v5_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
%% -------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions ...q_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ void noLostConfirmedMessagesWhenLeaderGoesAway() throws Exception {
() -> {
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
Expand Down Expand Up @@ -467,6 +468,7 @@ void consumerReattachesToOtherReplicaWhenReplicaGoesAway() throws Exception {
// 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();

Expand Down
5 changes: 4 additions & 1 deletion ...am/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/LeaderLocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
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;
Expand Down Expand Up @@ -57,7 +58,9 @@ void invalidLocatorShouldReturnError() {
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 =
Expand Down
Loading