Skip to content

Commit 461c020

Browse files
authored
test: sort npm set policy values before validation (#3358)
* sort set policy values before validation * address linter issues * sort expected values
1 parent c670d53 commit 461c020

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

npm/pkg/dataplane/ipsets/ipsetmanager_windows_test.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ipsets
22

33
import (
4-
"fmt"
4+
"sort"
5+
"strings"
56
"testing"
67

78
"github.com/Azure/azure-container-networking/common"
@@ -379,7 +380,19 @@ func verifyHNSCache(t *testing.T, expected map[string]hcn.SetPolicySetting, hns
379380
for setName, setObj := range expected {
380381
cacheObj := hns.Cache.SetPolicy(setObj.Id)
381382
require.NotNil(t, cacheObj)
382-
require.Equal(t, setObj, *cacheObj, fmt.Sprintf("%s mismatch in cache", setName))
383+
384+
// make values always sorted for testing consistency
385+
members := strings.Split(cacheObj.Values, ",")
386+
sort.Strings(members)
387+
copyOfCachedObj := *cacheObj
388+
copyOfCachedObj.Values = strings.Join(members, ",")
389+
390+
expectedMembers := strings.Split(setObj.Values, ",")
391+
sort.Strings(expectedMembers)
392+
copyOfExpectedObj := setObj
393+
copyOfExpectedObj.Values = strings.Join(expectedMembers, ",")
394+
395+
require.Equal(t, copyOfExpectedObj, copyOfCachedObj, setName+" mismatch in cache")
383396
}
384397
}
385398

0 commit comments

Comments
 (0)