Merge pull request #372 from beautytiger/dev-191022-fixtest

k8s-ci-robot · web-flow · commit 94262e8574e2 · 2019-10-22T09:43:21.000-07:00
fix wrong compare expression in testcase in pkg controller
diff --git a/pkg/controller/topology_test.go b/pkg/controller/topology_test.go
@@ -1485,7 +1485,7 @@ func volumeNodeAffinitiesEqual(n1, n2 *v1.VolumeNodeAffinity) bool {
 	if (ns1 == nil) && (ns2 == nil) {
 		return true
 	}
-	if len(ns1.NodeSelectorTerms) != len(ns1.NodeSelectorTerms) {
+	if len(ns1.NodeSelectorTerms) != len(ns2.NodeSelectorTerms) {
 		return false
 	}
 	match := func(terms1, terms2 []v1.NodeSelectorTerm) bool {

Original file line number	Diff line number	Diff line change
`@@ -1485,7 +1485,7 @@ func volumeNodeAffinitiesEqual(n1, n2 *v1.VolumeNodeAffinity) bool {`
`1485`	`1485`	`if (ns1 == nil) && (ns2 == nil) {`
`1486`	`1486`	`return true`
`1487`	`1487`	`}`
`1488`		`- if len(ns1.NodeSelectorTerms) != len(ns1.NodeSelectorTerms) {`
	`1488`	`+ if len(ns1.NodeSelectorTerms) != len(ns2.NodeSelectorTerms) {`
`1489`	`1489`	`return false`
`1490`	`1490`	`}`
`1491`	`1491`	`match := func(terms1, terms2 []v1.NodeSelectorTerm) bool {`