Skip to content

Commit 5d8f403

Browse files
committed
feature_flags_SUITE: Check feature flag support state
... in addition to the fact they are disabled. Because a unsupported feature flag is implicitly disabled. (cherry picked from commit a53285e)
1 parent c4da5ef commit 5d8f403

File tree

1 file changed

+36
-18
lines changed

1 file changed

+36
-18
lines changed

test/feature_flags_SUITE.erl

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -611,18 +611,26 @@ clustering_ok_with_ff_disabled_everywhere(Config) ->
611611

612612
log_feature_flags_of_all_nodes(Config),
613613
case FFSubsysOk of
614-
true -> ?assertEqual([false, false],
615-
is_feature_flag_enabled(Config, ff_from_testsuite));
616-
false -> ok
614+
true ->
615+
?assertEqual([true, true],
616+
is_feature_flag_supported(Config, ff_from_testsuite)),
617+
?assertEqual([false, false],
618+
is_feature_flag_enabled(Config, ff_from_testsuite));
619+
false ->
620+
ok
617621
end,
618622

619623
?assertEqual(Config, rabbit_ct_broker_helpers:cluster_nodes(Config)),
620624

621625
log_feature_flags_of_all_nodes(Config),
622626
case FFSubsysOk of
623-
true -> ?assertEqual([false, false],
624-
is_feature_flag_enabled(Config, ff_from_testsuite));
625-
false -> ok
627+
true ->
628+
?assertEqual([true, true],
629+
is_feature_flag_supported(Config, ff_from_testsuite)),
630+
?assertEqual([false, false],
631+
is_feature_flag_enabled(Config, ff_from_testsuite));
632+
false ->
633+
ok
626634
end,
627635
ok.
628636

@@ -637,18 +645,24 @@ clustering_ok_with_ff_enabled_on_some_nodes(Config) ->
637645

638646
log_feature_flags_of_all_nodes(Config),
639647
case FFSubsysOk of
640-
true -> ?assertEqual([true, false],
641-
is_feature_flag_enabled(Config, ff_from_testsuite));
642-
false -> ok
648+
true ->
649+
?assertEqual([true, true],
650+
is_feature_flag_supported(Config, ff_from_testsuite)),
651+
?assertEqual([true, false],
652+
is_feature_flag_enabled(Config, ff_from_testsuite));
653+
false ->
654+
ok
643655
end,
644656

645657
?assertEqual(Config, rabbit_ct_broker_helpers:cluster_nodes(Config)),
646658

647659
log_feature_flags_of_all_nodes(Config),
648660
case FFSubsysOk of
649-
true -> ?assertEqual([true, true],
650-
is_feature_flag_enabled(Config, ff_from_testsuite));
651-
false -> ok
661+
true ->
662+
?assertEqual([true, true],
663+
is_feature_flag_enabled(Config, ff_from_testsuite));
664+
false ->
665+
ok
652666
end,
653667
ok.
654668

@@ -661,18 +675,22 @@ clustering_ok_with_ff_enabled_everywhere(Config) ->
661675

662676
log_feature_flags_of_all_nodes(Config),
663677
case FFSubsysOk of
664-
true -> ?assertEqual([true, true],
665-
is_feature_flag_enabled(Config, ff_from_testsuite));
666-
false -> ok
678+
true ->
679+
?assertEqual([true, true],
680+
is_feature_flag_enabled(Config, ff_from_testsuite));
681+
false ->
682+
ok
667683
end,
668684

669685
?assertEqual(Config, rabbit_ct_broker_helpers:cluster_nodes(Config)),
670686

671687
log_feature_flags_of_all_nodes(Config),
672688
case FFSubsysOk of
673-
true -> ?assertEqual([true, true],
674-
is_feature_flag_enabled(Config, ff_from_testsuite));
675-
false -> ok
689+
true ->
690+
?assertEqual([true, true],
691+
is_feature_flag_enabled(Config, ff_from_testsuite));
692+
false ->
693+
ok
676694
end,
677695
ok.
678696

0 commit comments

Comments
 (0)