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 error

Browse source 
Signed-off-by: Yuvraj <yuvraj.yad001@gmail.com>
This commit is contained in:
Yuvraj 2020-03-27 14:39:35 +05:30
parent 43a9139303
commit c873306564
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -714,25 +714,13 @@ func TestMeetConditions_AtleastOneExist(t *testing.T) {
var resource, overlay interface{}
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 010bc2b43d99e27daf8709baca5b02ac5ca10011
err := json.Unmarshal(resourceRaw, &resource)
assert.NilError(t, err)
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
path, err := meetConditions(resource, overlay)
<<<<<<< HEAD
=======
json.Unmarshal(resourceRaw, &resource)
json.Unmarshal(overlayRaw, &overlay)
path, err := meetConditions(log.Log, resource, overlay)
>>>>>>> 589f8ece47f95aedc4ee0decee8d29cb77b73dd6
=======
>>>>>>> 010bc2b43d99e27daf8709baca5b02ac5ca10011
assert.Assert(t, reflect.DeepEqual(err, overlayError{}))
assert.Assert(t, len(path) == 0)
}