Skip to content

test: sort npm set policy values before validation #3358

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 4 commits into from
Feb 21, 2025
Merged

test: sort npm set policy values before validation #3358

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55c1158
sort set policy values before validation
QxBytes Jan 21, 2025
e11864a
address linter issues
QxBytes Jan 21, 2025
34ee01b
sort expected values
QxBytes Jan 21, 2025
cfd7d8b
address feedback
QxBytes Feb 20, 2025
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
19 changes: 17 additions & 2 deletions npm/pkg/dataplane/ipsets/ipsetmanager_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package ipsets

import (
"fmt"
"sort"
"strings"
"testing"

"github.com/Azure/azure-container-networking/common"
Expand Down Expand Up @@ -375,11 +376,25 @@ func TestFailureOnDeletion(t *testing.T) {
verifyDeletedHNSCache(t, toDeleteSetNames, hns)
}

// sorts the Values field of the hcn set policy setting and returns a copy with sorted values
func getSortedHnsPolicySetting(setting *hcn.SetPolicySetting) hcn.SetPolicySetting {
members := strings.Split(setting.Values, ",")
sort.Strings(members)
copyOfSetting := *setting
copyOfSetting.Values = strings.Join(members, ",")
return copyOfSetting
}

func verifyHNSCache(t *testing.T, expected map[string]hcn.SetPolicySetting, hns *hnswrapper.Hnsv2wrapperFake) {
for setName, setObj := range expected {
cacheObj := hns.Cache.SetPolicy(setObj.Id)
require.NotNil(t, cacheObj)
require.Equal(t, setObj, *cacheObj, fmt.Sprintf("%s mismatch in cache", setName))

// make values always sorted for testing consistency
copyOfCachedObj := getSortedHnsPolicySetting(cacheObj)
copyOfExpectedObj := getSortedHnsPolicySetting(&setObj)

require.Equal(t, copyOfExpectedObj, copyOfCachedObj, setName+" mismatch in cache")
}
}

Expand Down
Loading