Skip to content

Commit c760b1d

Browse files
committed
fix merge test for new behavior
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
1 parent 9138e08 commit c760b1d

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

merge/multiple_appliers_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,14 +1061,14 @@ func TestMultipleAppliersNestedType(t *testing.T) {
10611061
},
10621062
},
10631063
Object: `
1064-
mapOfMapsRecursive:
1065-
a:
1066-
c:
1067-
d:
1068-
e:
1069-
f:
1070-
g:
1071-
`,
1064+
mapOfMapsRecursive:
1065+
a: {}
1066+
c:
1067+
d:
1068+
e:
1069+
f:
1070+
g:
1071+
`,
10721072
APIVersion: "v1",
10731073
Managed: fieldpath.ManagedFields{
10741074
"apply-one": fieldpath.NewVersionedSet(
@@ -1187,13 +1187,13 @@ func TestMultipleAppliersDeducedType(t *testing.T) {
11871187
},
11881188
},
11891189
Object: `
1190-
a:
1191-
c:
1192-
d:
1193-
e:
1194-
f:
1195-
g:
1196-
`,
1190+
a: {}
1191+
c:
1192+
d:
1193+
e:
1194+
f:
1195+
g:
1196+
`,
11971197
APIVersion: "v1",
11981198
Managed: fieldpath.ManagedFields{
11991199
"apply-two": fieldpath.NewVersionedSet(

merge/nested_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,8 @@ func TestUpdateNestedType(t *testing.T) {
554554
},
555555
},
556556
Object: `
557-
struct:
558-
`,
557+
struct: {}
558+
`,
559559
APIVersion: "v1",
560560
Managed: fieldpath.ManagedFields{
561561
"default": fieldpath.NewVersionedSet(

0 commit comments

Comments
 (0)