kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Update setter comments during 3-way merge

Browse Source
This commit is contained in:
Phani Teja Marupaka
2020-08-02 18:24:56 -07:00
parent 17f935452f
commit 4e74947731
6 changed files with 222 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kyaml/yaml/merge3/list_test.go
View File

@@ -9,7 +9,8 @@ var listTestCases = []testCase{
//
// Test Case
//
{description: `Replace list`,
{
description: `Replace list`,
origin: `
list:
- 1
@@ -34,7 +35,8 @@ list:
//
// Test Case
//
{description: `Add an updated list`,
{
description: `Add an updated list`,
origin: `
apiVersion: apps/v1
list: # old value
@@ -62,7 +64,8 @@ list:
//
// Test Case
//
{description: `Add keep an omitted field`,
{
description: `Add keep an omitted field`,
origin: `
apiVersion: apps/v1
kind: Deployment`,
@@ -89,7 +92,8 @@ kind: StatefulSet
// Test Case
//
// TODO(#36): consider making this an error
{description: `Change an updated field`,
{
description: `Change an updated field`,
origin: `
apiVersion: apps/v1
list: # old value
@@ -119,7 +123,8 @@ list: # conflicting value
//
// Test Case
//
{description: `Ignore a field -- set`,
{
description: `Ignore a field -- set`,
origin: `
apiVersion: apps/v1
list: # ignore value
@@ -151,7 +156,8 @@ list:
//
// Test Case
//
{description: `Ignore a field -- empty`,
{
description: `Ignore a field -- empty`,
origin: `
apiVersion: apps/v1
list: # ignore value
@@ -174,7 +180,8 @@ apiVersion: apps/v1
//
// Test Case
//
{description: `Explicitly clear a field`,
{
description: `Explicitly clear a field`,
origin: `
apiVersion: apps/v1`,
update: `
@@ -192,7 +199,8 @@ apiVersion: apps/v1`},
//
// Test Case
//
{description: `Implicitly clear a field`,
{
description: `Implicitly clear a field`,
origin: `
apiVersion: apps/v1
list: # clear value
@@ -214,7 +222,8 @@ apiVersion: apps/v1`},
// Test Case
//
// TODO(#36): consider making this an error
{description: `Implicitly clear a changed field`,
{
description: `Implicitly clear a changed field`,
origin: `
apiVersion: apps/v1
list: # old value