github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26510 from AdoHe/patch_test

Browse Source 
Automatic merge from submit-queue

update strategic patch test for merge list of maps

Refer #26418 for more details. @janetkuo the test case is added, ptal.
This commit is contained in:
Kubernetes Submit Queue
2016-08-15 20:38:22 -07:00
committed by GitHub
parent c5ab95cd79 d06a77065a
commit 096dd4df50
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: