Fix tests broken by new mechanism

Author: apelisse

merge/ignore_test.go

@@ -174,10 +174,8 @@ func TestIgnoredFieldsUsesVersions(t *testing.T) {
 					APIVersion: "v2",
 				},
 				Apply{
-					Manager: "apply-one",
-					Object: `
-						mapOfMapsRecursive:
-					`,
+					Manager:    "apply-one",
+					Object:     ``,
 					APIVersion: "v4",
 				},
 			},

merge/multiple_appliers_test.go

@@ -554,11 +554,10 @@ func testMultipleAppliersFieldUnsetting(t *testing.T, v1, v2, v3 fieldpath.APIVe
 					`,
 				},
 			},
-			Object: typed.YAMLObject(fmt.Sprintf(`
+			Object: typed.YAMLObject(`
 				struct:
 				  name: a
-				  complexField_%s: null
-			`, v3)),
+			`),
 			APIVersion: v3,
 			Managed: fieldpath.ManagedFields{
 				"apply-one": fieldpath.NewVersionedSet(
@@ -1054,10 +1053,8 @@ func TestMultipleAppliersNestedType(t *testing.T) {
 					APIVersion: "v3",
 				},
 				Apply{
-					Manager: "apply-one",
-					Object: `
-						mapOfMapsRecursive:
-					`,
+					Manager:    "apply-one",
+					Object:     ``,
 					APIVersion: "v4",
 				},
 			},
@@ -1268,10 +1265,8 @@ func TestMultipleAppliersRealConversion(t *testing.T) {
 					APIVersion: "v3",
 				},
 				Apply{
-					Manager: "apply-one",
-					Object: `
-						mapOfMapsRecursive:
-					`,
+					Manager:    "apply-one",
+					Object:     ``,
 					APIVersion: "v4",
 				},
 			},