Skip to content

no-jira: TestSetCapabilities: use KnownClusterVersionCapabilities for known keys instead of picking DefaultCapabilitySet #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2024
Merged

no-jira: TestSetCapabilities: use KnownClusterVersionCapabilities for known keys instead of picking DefaultCapabilitySet #1073

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/capability/capability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
wantKnownKeys: configv1.KnownClusterVersionCapabilities,
wantEnabledKeys: []configv1.ClusterVersionCapability{},
},
{name: "set capabilities 4_11",
Expand All @@ -46,7 +46,7 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
wantKnownKeys: configv1.KnownClusterVersionCapabilities,
wantEnabledKeys: []configv1.ClusterVersionCapability{
configv1.ClusterVersionCapabilityBaremetal,
configv1.ClusterVersionCapabilityMarketplace,
Expand All @@ -63,7 +63,7 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
wantKnownKeys: configv1.KnownClusterVersionCapabilities,
wantEnabledKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
},
{name: "set capabilities None with additional",
Expand All @@ -75,7 +75,7 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
wantKnownKeys: configv1.KnownClusterVersionCapabilities,
wantEnabledKeys: []configv1.ClusterVersionCapability{"cap1", "cap2", "cap3"},
},
{name: "set capabilities 4_11 with additional",
Expand All @@ -87,7 +87,7 @@ func TestSetCapabilities(t *testing.T) {
},
},
},
wantKnownKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
wantKnownKeys: configv1.KnownClusterVersionCapabilities,
wantEnabledKeys: []configv1.ClusterVersionCapability{
configv1.ClusterVersionCapabilityBaremetal,
configv1.ClusterVersionCapabilityMarketplace,
Expand All @@ -105,7 +105,7 @@ func TestSetCapabilities(t *testing.T) {
if test.config.Spec.Capabilities == nil || (test.config.Spec.Capabilities != nil &&
len(test.config.Spec.Capabilities.BaselineCapabilitySet) == 0) {

test.wantKnownKeys = configv1.ClusterVersionCapabilitySets[DefaultCapabilitySet]
test.wantKnownKeys = configv1.KnownClusterVersionCapabilities
test.wantEnabledKeys = configv1.ClusterVersionCapabilitySets[DefaultCapabilitySet]
}
if len(caps.KnownCapabilities) != len(test.wantKnownKeys) {
Expand Down