From e7b3e6c4e5c0a2fc99507f11d28c471b2a385fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Valais?= Date: Mon, 1 Mar 2021 14:12:02 +0100 Subject: [PATCH] PR comment: no more "return" in test code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maël Valais Co-authored-by: Irbe Krumina --- .../certificaterequests/ca/ca_test.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkg/controller/certificaterequests/ca/ca_test.go b/pkg/controller/certificaterequests/ca/ca_test.go index 46e8c44b4..e82771e7b 100644 --- a/pkg/controller/certificaterequests/ca/ca_test.go +++ b/pkg/controller/certificaterequests/ca/ca_test.go @@ -401,7 +401,6 @@ func runTest(t *testing.T, test testT) { } func TestCA_Sign(t *testing.T) { - rsaPair, err := pki.GenerateRSAPrivateKey(2048) require.NoError(t, err) rsaCSR := generateCSR(t, rsaPair) @@ -531,16 +530,16 @@ func TestCA_Sign(t *testing.T) { gotIssueResp, gotErr := c.Sign(context.Background(), test.givenCR, test.givenCAIssuer) if test.wantErr != "" { - assert.EqualError(t, gotErr, test.wantErr) - return + require.EqualError(t, gotErr, test.wantErr) + } else { + require.NoError(t, gotErr) + + require.NotNil(t, gotIssueResp) + gotCert, err := pki.DecodeX509CertificateBytes(gotIssueResp.Certificate) + require.NoError(t, err) + + test.assertSignedCert(t, gotCert) } - require.NoError(t, gotErr) - require.NotNil(t, gotIssueResp) - - gotCert, err := pki.DecodeX509CertificateBytes(gotIssueResp.Certificate) - require.NoError(t, err) - - test.assertSignedCert(t, gotCert) }) } }