summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kuryloski <kuryloskip@vmware.com>2021-09-30 10:38:39 +0200
committerPhilip Kuryloski <kuryloskip@vmware.com>2021-09-30 10:46:30 +0200
commita9763087f1c81cd2e8ae53f8089bd423f08a2150 (patch)
tree25c7313a7aadef09dc2e66ca1955db50e18c7d78
parent14dbb99a225c578f89ef8270b456e366e726ca31 (diff)
downloadrabbitmq-server-git-a9763087f1c81cd2e8ae53f8089bd423f08a2150.tar.gz
Shard cluster_management_SUITE by testcase to better manage timeouts
The suite level timeout the .erl I've learned is actually per case. By sharding bu testcase, we can better match the common test level and bazel level timeouts, such that we can get logs from remote test run failures. (cherry picked from commit 9c9fb7ffb01c8bdfbf9bd98b5eeb7799a26b0901)
-rw-r--r--deps/rabbit/BUILD.bazel3
-rw-r--r--deps/rabbit/test/clustering_management_SUITE.erl6
2 files changed, 4 insertions, 5 deletions
diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
index a31d5dcb34..d34564ec2b 100644
--- a/deps/rabbit/BUILD.bazel
+++ b/deps/rabbit/BUILD.bazel
@@ -348,7 +348,8 @@ suites = [
name = "clustering_management_SUITE",
size = "large",
flaky = True,
- shard_count = 4,
+ shard_count = 19,
+ sharding_method = "case",
),
rabbitmq_integration_suite(
PACKAGE,
diff --git a/deps/rabbit/test/clustering_management_SUITE.erl b/deps/rabbit/test/clustering_management_SUITE.erl
index 2c7d0c1d67..0204672f11 100644
--- a/deps/rabbit/test/clustering_management_SUITE.erl
+++ b/deps/rabbit/test/clustering_management_SUITE.erl
@@ -64,10 +64,8 @@ groups() ->
suite() ->
[
- %% If a test hangs, no need to wait for 30 minutes.
- %% 14 minutes is one minute less than the current bazel timeout,
- %% which should allow logs to be collected during a timeout
- {timetrap, {minutes, 14}}
+ %% If a testcase hangs, no need to wait for 30 minutes.
+ {timetrap, {minutes, 5}}
].
%% -------------------------------------------------------------------