Skip to content

Commit 3ddda27

Browse files
fix feature gat cleanup in ReleaseVersionPriority tests
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>
1 parent 0b9fb5b commit 3ddda27

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

internal/operator-controller/catalogmetadata/filter/successors_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,13 @@ func TestLegacySuccessor(t *testing.T) {
246246
// TestSuccessorsOf_WithReleaseVersionPriority_FeatureGateDisabled verifies higher releases
247247
// are NOT successors when ReleaseVersionPriority gate is disabled (testing the default behavior).
248248
func TestSuccessorsOf_WithReleaseVersionPriority_FeatureGateDisabled(t *testing.T) {
249+
// Explicitly disable the feature gate for this test
250+
prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.ReleaseVersionPriority)
251+
require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=false", features.ReleaseVersionPriority)))
252+
t.Cleanup(func() {
253+
require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=%t", features.ReleaseVersionPriority, prevEnabled)))
254+
})
255+
249256
channel := declcfg.Channel{
250257
Entries: []declcfg.ChannelEntry{
251258
{Name: "test-package.v1.0.0+1"},
@@ -279,9 +286,10 @@ func TestSuccessorsOf_WithReleaseVersionPriority_FeatureGateDisabled(t *testing.
279286
// as valid successors when ReleaseVersionPriority gate is enabled.
280287
func TestSuccessorsOf_WithReleaseVersionPriority_FeatureGateEnabled(t *testing.T) {
281288
// Enable the feature gate for this test
289+
prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.ReleaseVersionPriority)
282290
require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=true", features.ReleaseVersionPriority)))
283291
t.Cleanup(func() {
284-
require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=false", features.ReleaseVersionPriority)))
292+
require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=%t", features.ReleaseVersionPriority, prevEnabled)))
285293
})
286294

287295
channel := declcfg.Channel{

0 commit comments

Comments
 (0)