Skip to content

Commit 8191b9a

Browse files
authored
Merge pull request #3446 from rabbitmq/mergify/bp/v3.8.x/pr-3444
Split the feature_flags_SUITE into two parts for CI/Bazel (backport #3443) (backport #3444)
2 parents d6eea87 + 4f59392 commit 8191b9a

File tree

3 files changed

+88
-3
lines changed

3 files changed

+88
-3
lines changed

deps/rabbit/BUILD.bazel

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,19 @@ suites = [
438438
size = "large",
439439
flaky = True,
440440
shard_count = 5,
441+
runtime_deps = [
442+
"//deps/rabbit/test/feature_flags_SUITE_data/my_plugin:bazel_erlang_lib",
443+
],
444+
),
445+
rabbitmq_integration_suite(
446+
PACKAGE,
447+
name = "feature_flags_with_unpriveleged_user_SUITE",
448+
size = "large",
449+
additional_beam = [
450+
":feature_flags_SUITE_beam_files",
451+
],
452+
flaky = True,
453+
shard_count = 2,
441454
# The enabling_* tests chmod files and then expect writes to be blocked.
442455
# This probably doesn't work because we are root in the remote docker image.
443456
tags = ["exclusive"],

deps/rabbit/test/feature_flags_SUITE.erl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,12 @@ groups() ->
6161
{enabling_on_single_node, [],
6262
[
6363
enable_feature_flag_in_a_healthy_situation,
64-
enable_unsupported_feature_flag_in_a_healthy_situation,
65-
enable_feature_flag_when_ff_file_is_unwritable
64+
enable_unsupported_feature_flag_in_a_healthy_situation
6665
]},
6766
{enabling_in_cluster, [],
6867
[
6968
enable_feature_flag_in_a_healthy_situation,
7069
enable_unsupported_feature_flag_in_a_healthy_situation,
71-
enable_feature_flag_when_ff_file_is_unwritable,
7270
enable_feature_flag_with_a_network_partition,
7371
mark_feature_flag_as_enabled_with_a_network_partition
7472
]},
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
%% This Source Code Form is subject to the terms of the Mozilla Public
2+
%% License, v. 2.0. If a copy of the MPL was not distributed with this
3+
%% file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
%%
5+
%% Copyright (c) 2018-2021 VMware, Inc. or its affiliates. All rights reserved.
6+
%%
7+
8+
-module(feature_flags_with_unpriveleged_user_SUITE).
9+
10+
-include_lib("common_test/include/ct.hrl").
11+
-include_lib("eunit/include/eunit.hrl").
12+
13+
-export([suite/0,
14+
all/0,
15+
groups/0,
16+
init_per_suite/1,
17+
end_per_suite/1,
18+
init_per_group/2,
19+
end_per_group/2,
20+
init_per_testcase/2,
21+
end_per_testcase/2,
22+
23+
enable_feature_flag_when_ff_file_is_unwritable/1
24+
]).
25+
26+
suite() ->
27+
[{timetrap, {minutes, 15}}].
28+
29+
all() ->
30+
[
31+
{group, enabling_on_single_node},
32+
{group, enabling_in_cluster}
33+
].
34+
35+
groups() ->
36+
[
37+
{enabling_on_single_node, [],
38+
[
39+
enable_feature_flag_when_ff_file_is_unwritable
40+
]},
41+
{enabling_in_cluster, [],
42+
[
43+
enable_feature_flag_when_ff_file_is_unwritable
44+
]}
45+
].
46+
47+
%% This suite exists to allow running a portion of the feature_flags_SUITE
48+
%% under separate conditions in ci
49+
50+
init_per_suite(Config) ->
51+
feature_flags_SUITE:init_per_suite(Config).
52+
53+
end_per_suite(Config) ->
54+
feature_flags_SUITE:end_per_suite(Config).
55+
56+
57+
init_per_group(Group, Config) ->
58+
feature_flags_SUITE:init_per_group(Group, Config).
59+
60+
end_per_group(Group, Config) ->
61+
feature_flags_SUITE:end_per_group(Group, Config).
62+
63+
init_per_testcase(Testcase, Config) ->
64+
feature_flags_SUITE:init_per_testcase(Testcase, Config).
65+
66+
end_per_testcase(Testcase, Config) ->
67+
feature_flags_SUITE:end_per_testcase(Testcase, Config).
68+
69+
%% -------------------------------------------------------------------
70+
%% Testcases.
71+
%% -------------------------------------------------------------------
72+
73+
enable_feature_flag_when_ff_file_is_unwritable(Config) ->
74+
feature_flags_SUITE:enable_feature_flag_when_ff_file_is_unwritable(Config).

0 commit comments

Comments
 (0)