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. --- client/httpclient_test.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'client/httpclient_test.go') diff --git a/client/httpclient_test.go b/client/httpclient_test.go index 2d2a06e..5c1ebe3 100644 --- a/client/httpclient_test.go +++ b/client/httpclient_test.go @@ -48,8 +48,7 @@ func TestBasicAuthSettings(t *testing.T) { }, } - client, cleanup := setup(t, username, password, requests) - defer cleanup() + client := setup(t, username, password, requests) response, err := client.Get(context.Background(), "/get_endpoint") require.NoError(t, err) @@ -86,8 +85,7 @@ func TestEmptyBasicAuthSettings(t *testing.T) { }, } - client, cleanup := setup(t, "", "", requests) - defer cleanup() + client := setup(t, "", "", requests) _, err := client.Get(context.Background(), "/empty_basic_auth") require.NoError(t, err) @@ -110,8 +108,7 @@ func TestRequestWithUserAgent(t *testing.T) { }, } - client, cleanup := setup(t, "", "", requests) - defer cleanup() + client := setup(t, "", "", requests) _, err := client.Get(context.Background(), "/default_user_agent") require.NoError(t, err) @@ -122,13 +119,13 @@ func TestRequestWithUserAgent(t *testing.T) { } -func setup(t *testing.T, username, password string, requests []testserver.TestRequestHandler) (*GitlabNetClient, func()) { - url, cleanup := testserver.StartHttpServer(t, requests) +func setup(t *testing.T, username, password string, requests []testserver.TestRequestHandler) *GitlabNetClient { + url := testserver.StartHttpServer(t, requests) httpClient := NewHTTPClient(url, "", "", "", false, 1) client, err := NewGitlabNetClient(username, password, "", httpClient) require.NoError(t, err) - return client, cleanup + return client } -- cgit v1.2.1