From ee41d0dfb7b02a19f5926bfe24dbad1df417a29e Mon Sep 17 00:00:00 2001 From: Igor Drozdov Date: Wed, 17 Mar 2021 21:18:42 +0300 Subject: Replace cleanup functions with t.Cleanup In this case we don't need to propagate cleanup function. It simplifies the code. --- internal/gitlabnet/personalaccesstoken/client_test.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'internal/gitlabnet/personalaccesstoken/client_test.go') diff --git a/internal/gitlabnet/personalaccesstoken/client_test.go b/internal/gitlabnet/personalaccesstoken/client_test.go index d9c3f45..d67b085 100644 --- a/internal/gitlabnet/personalaccesstoken/client_test.go +++ b/internal/gitlabnet/personalaccesstoken/client_test.go @@ -85,8 +85,7 @@ func initialize(t *testing.T) { } func TestGetPersonalAccessTokenByKeyId(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) args := &commandargs.Shell{GitlabKeyId: "0"} result, err := client.GetPersonalAccessToken( @@ -104,8 +103,7 @@ func TestGetPersonalAccessTokenByKeyId(t *testing.T) { } func TestGetRecoveryCodesByUsername(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) args := &commandargs.Shell{GitlabUsername: "jane-doe"} result, err := client.GetPersonalAccessToken( @@ -117,8 +115,7 @@ func TestGetRecoveryCodesByUsername(t *testing.T) { } func TestMissingUser(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) args := &commandargs.Shell{GitlabKeyId: "1"} _, err := client.GetPersonalAccessToken( @@ -128,8 +125,7 @@ func TestMissingUser(t *testing.T) { } func TestErrorResponses(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) testCases := []struct { desc string @@ -166,12 +162,12 @@ func TestErrorResponses(t *testing.T) { } } -func setup(t *testing.T) (*Client, func()) { +func setup(t *testing.T) *Client { initialize(t) - url, cleanup := testserver.StartSocketHttpServer(t, requests) + url := testserver.StartSocketHttpServer(t, requests) client, err := NewClient(&config.Config{GitlabUrl: url}) require.NoError(t, err) - return client, cleanup + return client } -- cgit v1.2.1