Skip to content

Commit 232a958

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 12f4774 commit 232a958

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
@@ -613,18 +613,26 @@ clustering_ok_with_ff_disabled_everywhere(Config) ->
613613

614614
log_feature_flags_of_all_nodes(Config),
615615
case FFSubsysOk of
616-
true -> ?assertEqual([false, false],
617-
is_feature_flag_enabled(Config, ff_from_testsuite));
618-
false -> ok
616+
true ->
617+
?assertEqual([true, true],
618+
is_feature_flag_supported(Config, ff_from_testsuite)),
619+
?assertEqual([false, false],
620+
is_feature_flag_enabled(Config, ff_from_testsuite));
621+
false ->
622+
ok
619623
end,
620624

621625
?assertEqual(Config, rabbit_ct_broker_helpers:cluster_nodes(Config)),
622626

623627
log_feature_flags_of_all_nodes(Config),
624628
case FFSubsysOk of
625-
true -> ?assertEqual([false, false],
626-
is_feature_flag_enabled(Config, ff_from_testsuite));
627-
false -> ok
629+
true ->
630+
?assertEqual([true, true],
631+
is_feature_flag_supported(Config, ff_from_testsuite)),
632+
?assertEqual([false, false],
633+
is_feature_flag_enabled(Config, ff_from_testsuite));
634+
false ->
635+
ok
628636
end,
629637
ok.
630638

@@ -639,18 +647,24 @@ clustering_ok_with_ff_enabled_on_some_nodes(Config) ->
639647

640648
log_feature_flags_of_all_nodes(Config),
641649
case FFSubsysOk of
642-
true -> ?assertEqual([true, false],
643-
is_feature_flag_enabled(Config, ff_from_testsuite));
644-
false -> ok
650+
true ->
651+
?assertEqual([true, true],
652+
is_feature_flag_supported(Config, ff_from_testsuite)),
653+
?assertEqual([true, false],
654+
is_feature_flag_enabled(Config, ff_from_testsuite));
655+
false ->
656+
ok
645657
end,
646658

647659
?assertEqual(Config, rabbit_ct_broker_helpers:cluster_nodes(Config)),
648660

649661
log_feature_flags_of_all_nodes(Config),
650662
case FFSubsysOk of
651-
true -> ?assertEqual([true, true],
652-
is_feature_flag_enabled(Config, ff_from_testsuite));
653-
false -> ok
663+
true ->
664+
?assertEqual([true, true],
665+
is_feature_flag_enabled(Config, ff_from_testsuite));
666+
false ->
667+
ok
654668
end,
655669
ok.
656670

@@ -663,18 +677,22 @@ clustering_ok_with_ff_enabled_everywhere(Config) ->
663677

664678
log_feature_flags_of_all_nodes(Config),
665679
case FFSubsysOk of
666-
true -> ?assertEqual([true, true],
667-
is_feature_flag_enabled(Config, ff_from_testsuite));
668-
false -> ok
680+
true ->
681+
?assertEqual([true, true],
682+
is_feature_flag_enabled(Config, ff_from_testsuite));
683+
false ->
684+
ok
669685
end,
670686

671687
?assertEqual(Config, rabbit_ct_broker_helpers:cluster_nodes(Config)),
672688

673689
log_feature_flags_of_all_nodes(Config),
674690
case FFSubsysOk of
675-
true -> ?assertEqual([true, true],
676-
is_feature_flag_enabled(Config, ff_from_testsuite));
677-
false -> ok
691+
true ->
692+
?assertEqual([true, true],
693+
is_feature_flag_enabled(Config, ff_from_testsuite));
694+
false ->
695+
ok
678696
end,
679697
ok.
680698

0 commit comments

Comments
 (0)