From c13d5b57d3cbd3f7f151ecb2b8b13cbb76d0b71c Mon Sep 17 00:00:00 2001 From: Haoxiang Zhou Date: Thu, 18 Jun 2020 10:20:06 +0100 Subject: [PATCH] Corrected expected output of test Signed-off-by: Haoxiang Zhou --- test/integration/ctl/ctl_convert_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/integration/ctl/ctl_convert_test.go b/test/integration/ctl/ctl_convert_test.go index bf4682a2d..f135135b7 100644 --- a/test/integration/ctl/ctl_convert_test.go +++ b/test/integration/ctl/ctl_convert_test.go @@ -26,9 +26,9 @@ import ( ) const ( - testdataResource1 = "./testdata/convert_resource1.yaml" - testdataResource2 = "./testdata/convert_resource2.yaml" - testdataResource3 = "./testdata/convert_resource3.yaml" + testdataResource1 = "./testdata/convert_resource1.yaml" + testdataResource2 = "./testdata/convert_resource2.yaml" + testdataResource3 = "./testdata/convert_resource3.yaml" testdataResourceWithOrganizationV1alpha2 = "./testdata/convert_resource_with_organization_v1alpha2.yaml" targetv1alpha2 = "cert-manager.io/v1alpha2" @@ -84,7 +84,7 @@ func TestCtlConvert(t *testing.T) { expErr: true, }, "an object in v1alpha2 that uses a field that has been renamed in v1alpha3 should be converted properly": { - input: testdataResourceWithOrganizationV1alpha2, + input: testdataResourceWithOrganizationV1alpha2, targetVersion: targetv1alpha3, expOutput: ` apiVersion: cert-manager.io/v1alpha3 @@ -96,14 +96,14 @@ metadata: spec: commonName: my-csi-app isCA: true - subject: - organizations: - - hello world issuerRef: group: cert-manager.io kind: Issuer name: selfsigned-issuer secretName: ca-key-pair + subject: + organizations: + - hello world status: {}`, }, } @@ -128,7 +128,7 @@ status: {}`, } if strings.TrimSpace(test.expOutput) != strings.TrimSpace(outBuf.String()) { - t.Errorf("got unexpected output, exp=%s got=%s", + t.Errorf("got unexpected output, exp=%s\n got=%s", strings.TrimSpace(test.expOutput), strings.TrimSpace(outBuf.String())) } })