Merge pull request #26510 from AdoHe/patch_test

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.

Merge pull request #26510 from AdoHe/patch_test
096dd4df · Kubernetes Submit Queue · GitHub · c5ab95cd · d06a7706 · 096dd4df
Commit 096dd4df authored Aug 15, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 15, 2016
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

patch_test.go pkg/util/strategicpatch/patch_test.go +8 -0

No files found.
--- a/pkg/util/strategicpatch/patch_test.go
+++ b/pkg/util/strategicpatch/patch_test.go
@@ -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: