mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-30 03:15:05 +00:00
Code Activity

Fixed Conflict

Browse source
This commit is contained in:
Yuvraj 2020-03-27 15:07:14 +05:30
parent c873306564
commit b725f1ce05
1 changed files with 9 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
pkg/engine/mutate/overlayCondition_test.go
View file

@ -30,8 +30,7 @@ func TestMeetConditions_NoAnchor(t *testing.T) {
err := json.Unmarshal(overlayRaw, &overlay)
assert.Assert(t, reflect.DeepEqual(err, nil))
_, err := meetConditions(log.Log, nil, overlay)
_, err = meetConditions(log.Log, nil, overlay)
assert.Assert(t, reflect.DeepEqual(err, overlayError{}))
}
@ -87,7 +86,7 @@ func TestMeetConditions_conditionalAnchorOnMap(t *testing.T) {
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
_, err := meetConditions(log.Log, resource, overlay)
_, err = meetConditions(log.Log, resource, overlay)
assert.Assert(t, !reflect.DeepEqual(err, overlayError{}))
overlayRaw = []byte(`
@ -150,7 +149,7 @@ func TestMeetConditions_DifferentTypes(t *testing.T) {
// anchor exist
_, err := meetConditions(log.Log, resource, overlay)
_, err = meetConditions(log.Log, resource, overlay)
assert.Assert(t, strings.Contains(err.Error(), "Found anchor on different types of element at path /subsets/"))
}
@ -205,8 +204,7 @@ func TestMeetConditions_anchosInSameObject(t *testing.T) {
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
_, err := meetConditions(log.Log, resource, overlay)
_, err = meetConditions(log.Log, resource, overlay)
assert.Error(t, err, "[overlayError:0] Failed validating value 443 with overlay 444")
}
@ -261,13 +259,12 @@ func TestMeetConditions_anchorOnPeer(t *testing.T) {
var resource, overlay interface{}
err := json.Unmarshal(resourceRaw, &resource)
assert.NilError(t, err)
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
_, err := meetConditions(log.Log, resource, overlay)
_, err = meetConditions(log.Log, resource, overlay)
assert.Assert(t, reflect.DeepEqual(err, overlayError{}))
}
@ -347,16 +344,8 @@ func TestMeetConditions_anchorsOnMetaAndSpec(t *testing.T) {
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
<<<<<<< HEAD
<<<<<<< HEAD
_, err = meetConditions(resource, overlay)
=======
_, err := meetConditions(log.Log, resource, overlay)
>>>>>>> 589f8ece47f95aedc4ee0decee8d29cb77b73dd6
=======
_, err = meetConditions(resource, overlay)
_, err = meetConditions(log.Log, resource, overlay)
>>>>>>> 010bc2b43d99e27daf8709baca5b02ac5ca10011
assert.Assert(t, reflect.DeepEqual(err, overlayError{}))
}
@ -439,16 +428,8 @@ func TestMeetConditions_anchorsOnPeer_single(t *testing.T) {
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
<<<<<<< HEAD
<<<<<<< HEAD
_, err = meetConditions(resource, overlay)
=======
_, err := meetConditions(log.Log, resource, overlay)
>>>>>>> 589f8ece47f95aedc4ee0decee8d29cb77b73dd6
=======
_, err = meetConditions(resource, overlay)
_, err = meetConditions(log.Log, resource, overlay)
>>>>>>> 010bc2b43d99e27daf8709baca5b02ac5ca10011
assert.Assert(t, reflect.DeepEqual(err, overlayError{}))
}
@ -484,16 +465,8 @@ func TestMeetConditions_anchorsOnPeer_two(t *testing.T) {
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
<<<<<<< HEAD
<<<<<<< HEAD
_, err = meetConditions(resource, overlay)
=======
_, err := meetConditions(log.Log, resource, overlay)
>>>>>>> 589f8ece47f95aedc4ee0decee8d29cb77b73dd6
=======
_, err = meetConditions(resource, overlay)
_, err = meetConditions(log.Log, resource, overlay)
>>>>>>> 010bc2b43d99e27daf8709baca5b02ac5ca10011
assert.Error(t, err, "[overlayError:0] Failed validating value true with overlay false")
overlayRaw = []byte(`{
@ -589,16 +562,8 @@ func TestMeetConditions_anchorsOnPeer_multiple(t *testing.T) {
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
<<<<<<< HEAD
<<<<<<< HEAD
_, err = meetConditions(resource, overlay)
=======
_, err := meetConditions(log.Log, resource, overlay)
>>>>>>> 589f8ece47f95aedc4ee0decee8d29cb77b73dd6
=======
_, err = meetConditions(resource, overlay)
_, err = meetConditions(log.Log, resource, overlay)
>>>>>>> 010bc2b43d99e27daf8709baca5b02ac5ca10011
assert.Assert(t, reflect.DeepEqual(err, overlayError{}))
overlayRaw = []byte(`{