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:38:39 +0200
commit9c9fb7ffb01c8bdfbf9bd98b5eeb7799a26b0901 (patch)
tree9586701745da9bfef66213b0e26eacccfcdf6c3a
parent94f139e6fee07bebdfcb037bc3abf8a374ca84e6 (diff)
downloadrabbitmq-server-git-9c9fb7ffb01c8bdfbf9bd98b5eeb7799a26b0901.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.
-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 5b5d35512c..dc26502f24 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}}
].
%% -------------------------------------------------------------------