tpl/compare: Fix eq when > 2 args

Fixes #6786

diff --git a/tpl/compare/compare.go b/tpl/compare/compare.go
index b5b99ff9af9cc217a74d1af6488269fd602d17da..e005aff06fdc4cb190667553cde8be18296bc238 100644 (file)
--- a/tpl/compare/compare.go
+++ b/tpl/compare/compare.go
@@ -119,11 +119,17 @@ func (n *Namespace) Eq(first interface{}, others ...interface{}) bool {
        normFirst := normalize(first)
        for _, other := range others {
                if e, ok := first.(compare.Eqer); ok {
-                       return e.Eq(other)
+                       if e.Eq(other) {
+                               return true
+                       }
+                       continue
                }
 
                if e, ok := other.(compare.Eqer); ok {
-                       return e.Eq(first)
+                       if e.Eq(first) {
+                               return true
+                       }
+                       continue
                }
 
                other = normalize(other)

diff --git a/tpl/compare/compare_test.go b/tpl/compare/compare_test.go
index aeadb02f9bd8077a04b7f895471e05adf85ab2a5..3eb793d30060fcfa4ab7a3e6c5b03b66b3312615 100644 (file)
--- a/tpl/compare/compare_test.go
+++ b/tpl/compare/compare_test.go
@@ -275,6 +275,9 @@ func TestEqualExtend(t *testing.T) {
                {1, []interface{}{1, 2}, true},
                {1, []interface{}{2, 1}, true},
                {1, []interface{}{2, 3}, false},
+               {tstEqerType1("a"), []interface{}{tstEqerType1("a"), tstEqerType1("b")}, true},
+               {tstEqerType1("a"), []interface{}{tstEqerType1("b"), tstEqerType1("a")}, true},
+               {tstEqerType1("a"), []interface{}{tstEqerType1("b"), tstEqerType1("c")}, false},
        } {
 
                result := ns.Eq(test.first, test.others...)