summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kuryloski <kuryloskip@vmware.com>2021-11-09 11:03:05 +0100
committerPhilip Kuryloski <kuryloskip@vmware.com>2021-11-09 13:52:41 +0100
commite4505bea3d7243f004d01577bbc254a0c0ee6e63 (patch)
tree94b575c163fa97635776a9798f18f8cc5377ed60
parente721ab291f2c1ec2a348d917ff4913cf8b1dc7c6 (diff)
downloadrabbitmq-server-git-e4505bea3d7243f004d01577bbc254a0c0ee6e63.tar.gz
Use unique group names in rabbit_stream_SUITE
Technically duplicate names is supported by common test, but we have seen it contribute to flakiness in our suite in practice (cherry picked from commit 513446b6d10d69eed8e28f5951bceb7cdd11a9c1)
-rw-r--r--deps/rabbitmq_stream/BUILD.bazel1
-rw-r--r--deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl8
2 files changed, 6 insertions, 3 deletions
diff --git a/deps/rabbitmq_stream/BUILD.bazel b/deps/rabbitmq_stream/BUILD.bazel
index 6f7cb0b034..8601169b5c 100644
--- a/deps/rabbitmq_stream/BUILD.bazel
+++ b/deps/rabbitmq_stream/BUILD.bazel
@@ -91,6 +91,7 @@ suites = [
rabbitmq_integration_suite(
PACKAGE,
name = "rabbit_stream_SUITE",
+ shard_count = 3,
deps = [
"//deps/rabbit:bazel_erlang_lib",
"//deps/rabbitmq_stream_common:bazel_erlang_lib",
diff --git a/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl b/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
index 364f77879a..3c2c8fe18e 100644
--- a/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
+++ b/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
@@ -30,7 +30,9 @@
-define(WAIT, 5000).
all() ->
- [{group, single_node}, {group, cluster}].
+ [{group, single_node},
+ {group, single_node_1},
+ {group, cluster}].
groups() ->
[{single_node, [],
@@ -47,7 +49,7 @@ groups() ->
timeout_close_sent]},
%% Run `test_global_counters` on its own so the global metrics are
%% initialised to 0 for each testcase
- {single_node, [], [test_global_counters]},
+ {single_node_1, [], [test_global_counters]},
{cluster, [], [test_stream, test_stream_tls, java]}].
init_per_suite(Config) ->
@@ -62,7 +64,7 @@ init_per_suite(Config) ->
end_per_suite(Config) ->
Config.
-init_per_group(single_node, Config) ->
+init_per_group(Group, Config) when Group == single_node orelse Group == single_node_1 ->
Config1 =
rabbit_ct_helpers:set_config(Config, [{rmq_nodes_clustered, false}]),
Config2 =