mirror of https://github.com/k3s-io/k3s
update strategic patch test for merge list of maps
parent
77de942e08
commit
d06a77065a
|
@ -636,8 +636,12 @@ testCases:
|
|||
mergingList:
|
||||
- name: 3
|
||||
value: 3
|
||||
- name: 4
|
||||
value: 4
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 4
|
||||
value: 4
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
|
@ -654,6 +658,8 @@ testCases:
|
|||
mergingList:
|
||||
- name: 3
|
||||
value: 3
|
||||
- name: 4
|
||||
value: 4
|
||||
result:
|
||||
mergingList:
|
||||
- name: 1
|
||||
|
@ -663,6 +669,8 @@ testCases:
|
|||
other: b
|
||||
- name: 3
|
||||
value: 3
|
||||
- name: 4
|
||||
value: 4
|
||||
- description: merge lists of maps with conflict
|
||||
original:
|
||||
mergingList:
|
||||
|
|
Loading…
Reference in New Issue