github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update strategic patch test for merge list of maps

Browse Source
This commit is contained in:
AdoHe
2016-05-30 01:43:36 -04:00
parent 77de942e08
commit d06a77065a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/util/strategicpatch/patch_test.go
View File

@@ -636,8 +636,12 @@ testCases:
mergingList: mergingList:
- name: 3 - name: 3
value: 3 value: 3
- name: 4
value: 4
modified: modified:
mergingList: mergingList:
- name: 4
value: 4
- name: 1 - name: 1
- name: 2 - name: 2
value: 2 value: 2
@@ -654,6 +658,8 @@ testCases:
mergingList: mergingList:
- name: 3 - name: 3
value: 3 value: 3
- name: 4
value: 4
result: result:
mergingList: mergingList:
- name: 1 - name: 1
@@ -663,6 +669,8 @@ testCases:
other: b other: b
- name: 3 - name: 3
value: 3 value: 3
- name: 4
value: 4
- description: merge lists of maps with conflict - description: merge lists of maps with conflict
original: original:
mergingList: mergingList: