mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-07 19:23:40 +00:00
add test case for merging a patch against empty list
This commit is contained in:
parent
25a25e27a9
commit
95fea2f2bf
@ -1208,6 +1208,52 @@ testCases:
|
|||||||
`)
|
`)
|
||||||
|
|
||||||
var strategicMergePatchRawTestCases = []StrategicMergePatchRawTestCase{
|
var strategicMergePatchRawTestCases = []StrategicMergePatchRawTestCase{
|
||||||
|
{
|
||||||
|
Description: "nested patch merge with empty list",
|
||||||
|
StrategicMergePatchRawTestCaseData: StrategicMergePatchRawTestCaseData{
|
||||||
|
Original: []byte(`
|
||||||
|
name: hi
|
||||||
|
`),
|
||||||
|
Current: []byte(`
|
||||||
|
name: hi
|
||||||
|
mergingList:
|
||||||
|
- name: hello2
|
||||||
|
`),
|
||||||
|
Modified: []byte(`
|
||||||
|
name: hi
|
||||||
|
mergingList:
|
||||||
|
- name: hello
|
||||||
|
- $patch: delete
|
||||||
|
name: doesntexist
|
||||||
|
`),
|
||||||
|
TwoWay: []byte(`
|
||||||
|
mergingList:
|
||||||
|
- name: hello
|
||||||
|
- $patch: delete
|
||||||
|
name: doesntexist
|
||||||
|
`),
|
||||||
|
ThreeWay: []byte(`
|
||||||
|
$setElementOrder/mergingList:
|
||||||
|
- name: hello
|
||||||
|
- name: doesntexist
|
||||||
|
mergingList:
|
||||||
|
- name: hello
|
||||||
|
- $patch: delete
|
||||||
|
name: doesntexist
|
||||||
|
`),
|
||||||
|
TwoWayResult: []byte(`
|
||||||
|
name: hi
|
||||||
|
mergingList:
|
||||||
|
- name: hello
|
||||||
|
`),
|
||||||
|
Result: []byte(`
|
||||||
|
name: hi
|
||||||
|
mergingList:
|
||||||
|
- name: hello
|
||||||
|
- name: hello2
|
||||||
|
`),
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
Description: "delete items in lists of scalars",
|
Description: "delete items in lists of scalars",
|
||||||
StrategicMergePatchRawTestCaseData: StrategicMergePatchRawTestCaseData{
|
StrategicMergePatchRawTestCaseData: StrategicMergePatchRawTestCaseData{
|
||||||
|
Loading…
Reference in New Issue
Block a user