kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Rename ErrorIfNotEqual to ErrorIfNotEqualSets

Browse Source
This commit is contained in:
jregan
2019-06-06 20:20:48 -07:00
parent aa2d8b20cd
commit 0e4f9acb6e
14 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/transformers/labelsandannotations_test.go
View File

@@ -440,7 +440,7 @@ func TestLabelsRun(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = expected.ErrorIfNotEqual(m); err != nil {
if err = expected.ErrorIfNotEqualSets(m); err != nil {
t.Fatalf("actual doesn't match expected: %v", err)
}
}
@@ -576,7 +576,7 @@ func TestAnnotationsRun(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = expected.ErrorIfNotEqual(m); err != nil {
if err = expected.ErrorIfNotEqualSets(m); err != nil {
t.Fatalf("actual doesn't match expected: %v", err)
}
}
@@ -619,7 +619,7 @@ func TestAnnotaionsRunWithNullValue(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = expected.ErrorIfNotEqual(m); err != nil {
if err = expected.ErrorIfNotEqualSets(m); err != nil {
t.Fatalf("actual doesn't match expected: %v", err)
}

2
pkg/transformers/multitransformer.go
View File

@@ -78,7 +78,7 @@ func (o *multiTransformer) transformWithCheckConflict(m resmap.ResMap) error {
if err != nil {
return err
}
err = m.ErrorIfNotEqual(mcopy)
err = m.ErrorIfNotEqualSets(mcopy)
if err != nil {
return fmt.Errorf("found conflict between different patches\n%v", err)
}

4
pkg/transformers/namereference_test.go
View File

@@ -492,7 +492,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = expected.ErrorIfNotEqual(m); err != nil {
if err = expected.ErrorIfNotEqualSets(m); err != nil {
t.Fatalf("actual doesn't match expected: %v", err)
}
}
@@ -619,7 +619,7 @@ func TestNameReferencePersistentVolumeHappyRun(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = expected.ErrorIfNotEqual(m); err != nil {
if err = expected.ErrorIfNotEqualSets(m); err != nil {
t.Fatalf("actual doesn't match expected: %v", err)
}
}

4
pkg/transformers/namespace_test.go
View File

@@ -197,7 +197,7 @@ func TestNamespaceRun(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = expected.ErrorIfNotEqual(m); err != nil {
if err = expected.ErrorIfNotEqualSets(m); err != nil {
t.Fatalf("actual doesn't match expected: %v", err)
}
}
@@ -253,7 +253,7 @@ func TestNamespaceRunForClusterLevelKind(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = expected.ErrorIfNotEqual(m); err != nil {
if err = expected.ErrorIfNotEqualSets(m); err != nil {
t.Fatalf("actual doesn't match expected: %v", err)
}
}

2
pkg/transformers/prefixsuffixname_test.go
View File

@@ -90,7 +90,7 @@ func TestPrefixSuffixNameRun(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = expected.ErrorIfNotEqual(m); err != nil {
if err = expected.ErrorIfNotEqualSets(m); err != nil {
t.Fatalf("actual doesn't match expected: %v", err)
}
}

2
pkg/transformers/refvars_test.go
View File

@@ -101,7 +101,7 @@ func TestVarRef(t *testing.T) {
a, e := tc.given.res, tc.expected.res
if !reflect.DeepEqual(a, e) {
err = e.ErrorIfNotEqual(a)
err = e.ErrorIfNotEqualSets(a)
t.Fatalf("actual doesn't match expected: \nACTUAL:\n%v\nEXPECTED:\n%v\nERR: %v", a, e, err)
}