diff options
author | Nick Thomas <nick@gitlab.com> | 2021-03-17 18:53:54 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2021-03-17 18:53:54 +0000 |
commit | 88f94337bb87c0cc51f6badf7a4ff1826f25efaa (patch) | |
tree | 130f2777342645018f3f6b797ee0083d65910889 | |
parent | 4b40a2cb8c71a5b490cad4c8e1ad2dc0e9b39548 (diff) | |
parent | ee41d0dfb7b02a19f5926bfe24dbad1df417a29e (diff) | |
download | gitlab-shell-88f94337bb87c0cc51f6badf7a4ff1826f25efaa.tar.gz |
Merge branch 'id-refactor-cleanup' into 'main'
Replace cleanup functions with t.Cleanup
See merge request gitlab-org/gitlab-shell!460
30 files changed, 116 insertions, 166 deletions
diff --git a/client/client_test.go b/client/client_test.go index fec51c5..90cd499 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -26,7 +26,7 @@ func TestClients(t *testing.T) { desc string relativeURLRoot string caFile string - server func(*testing.T, []testserver.TestRequestHandler) (string, func()) + server func(*testing.T, []testserver.TestRequestHandler) string }{ { desc: "Socket client", @@ -49,7 +49,7 @@ func TestClients(t *testing.T) { { desc: "Https client", caFile: path.Join(testhelper.TestRoot, "certs/valid/server.crt"), - server: func(t *testing.T, handlers []testserver.TestRequestHandler) (string, func()) { + server: func(t *testing.T, handlers []testserver.TestRequestHandler) string { return testserver.StartHttpsServer(t, handlers, "") }, }, @@ -57,8 +57,7 @@ func TestClients(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - url, cleanup := tc.server(t, buildRequests(t, tc.relativeURLRoot)) - defer cleanup() + url := tc.server(t, buildRequests(t, tc.relativeURLRoot)) secret := "sssh, it's a secret" 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 } diff --git a/client/httpsclient_test.go b/client/httpsclient_test.go index dadd095..670f94a 100644 --- a/client/httpsclient_test.go +++ b/client/httpsclient_test.go @@ -51,8 +51,7 @@ func TestSuccessfulRequests(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - client, cleanup := setupWithRequests(t, tc.caFile, tc.caPath, tc.clientCAPath, tc.clientCertPath, tc.clientKeyPath, tc.selfSigned) - defer cleanup() + client := setupWithRequests(t, tc.caFile, tc.caPath, tc.clientCAPath, tc.clientCertPath, tc.clientKeyPath, tc.selfSigned) response, err := client.Get(context.Background(), "/hello") require.NoError(t, err) @@ -88,8 +87,7 @@ func TestFailedRequests(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - client, cleanup := setupWithRequests(t, tc.caFile, tc.caPath, "", "", "", false) - defer cleanup() + client := setupWithRequests(t, tc.caFile, tc.caPath, "", "", "", false) _, err := client.Get(context.Background(), "/hello") require.Error(t, err) @@ -99,7 +97,7 @@ func TestFailedRequests(t *testing.T) { } } -func setupWithRequests(t *testing.T, caFile, caPath, clientCAPath, clientCertPath, clientKeyPath string, selfSigned bool) (*GitlabNetClient, func()) { +func setupWithRequests(t *testing.T, caFile, caPath, clientCAPath, clientCertPath, clientKeyPath string, selfSigned bool) *GitlabNetClient { testDirCleanup, err := testhelper.PrepareTestRootDir() require.NoError(t, err) defer testDirCleanup() @@ -115,7 +113,7 @@ func setupWithRequests(t *testing.T, caFile, caPath, clientCAPath, clientCertPat }, } - url, cleanup := testserver.StartHttpsServer(t, requests, clientCAPath) + url := testserver.StartHttpsServer(t, requests, clientCAPath) var opts []HTTPClientOpt if clientCertPath != "" && clientKeyPath != "" { @@ -128,5 +126,5 @@ func setupWithRequests(t *testing.T, caFile, caPath, clientCAPath, clientCertPat client, err := NewGitlabNetClient("", "", "", httpClient) require.NoError(t, err) - return client, cleanup + return client } diff --git a/client/testserver/gitalyserver.go b/client/testserver/gitalyserver.go index 4bf14f3..301a737 100644 --- a/client/testserver/gitalyserver.go +++ b/client/testserver/gitalyserver.go @@ -58,9 +58,12 @@ func (s *TestGitalyServer) SSHUploadArchive(stream pb.SSHService_SSHUploadArchiv return nil } -func StartGitalyServer(t *testing.T) (string, *TestGitalyServer, func()) { +func StartGitalyServer(t *testing.T) (string, *TestGitalyServer) { + t.Helper() + tempDir, _ := ioutil.TempDir("", "gitlab-shell-test-api") gitalySocketPath := path.Join(tempDir, "gitaly.sock") + t.Cleanup(func() { os.RemoveAll(tempDir) }) err := os.MkdirAll(filepath.Dir(gitalySocketPath), 0700) require.NoError(t, err) @@ -74,12 +77,9 @@ func StartGitalyServer(t *testing.T) (string, *TestGitalyServer, func()) { pb.RegisterSSHServiceServer(server, &testServer) go server.Serve(listener) + t.Cleanup(func() { server.Stop() }) gitalySocketUrl := "unix:" + gitalySocketPath - cleanup := func() { - server.Stop() - os.RemoveAll(tempDir) - } - return gitalySocketUrl, &testServer, cleanup + return gitalySocketUrl, &testServer } diff --git a/client/testserver/testserver.go b/client/testserver/testserver.go index dee051b..0667cd4 100644 --- a/client/testserver/testserver.go +++ b/client/testserver/testserver.go @@ -27,9 +27,12 @@ type TestRequestHandler struct { Handler func(w http.ResponseWriter, r *http.Request) } -func StartSocketHttpServer(t *testing.T, handlers []TestRequestHandler) (string, func()) { +func StartSocketHttpServer(t *testing.T, handlers []TestRequestHandler) string { + t.Helper() + err := os.MkdirAll(filepath.Dir(testSocket), 0700) require.NoError(t, err) + t.Cleanup(func() { os.RemoveAll(tempDir) }) socketListener, err := net.Listen("unix", testSocket) require.NoError(t, err) @@ -44,16 +47,21 @@ func StartSocketHttpServer(t *testing.T, handlers []TestRequestHandler) (string, url := "http+unix://" + testSocket - return url, cleanupSocket + return url } -func StartHttpServer(t *testing.T, handlers []TestRequestHandler) (string, func()) { +func StartHttpServer(t *testing.T, handlers []TestRequestHandler) string { + t.Helper() + server := httptest.NewServer(buildHandler(handlers)) + t.Cleanup(func() { server.Close() }) - return server.URL, server.Close + return server.URL } -func StartHttpsServer(t *testing.T, handlers []TestRequestHandler, clientCAPath string) (string, func()) { +func StartHttpsServer(t *testing.T, handlers []TestRequestHandler, clientCAPath string) string { + t.Helper() + crt := path.Join(testhelper.TestRoot, "certs/valid/server.crt") key := path.Join(testhelper.TestRoot, "certs/valid/server.key") @@ -63,7 +71,7 @@ func StartHttpsServer(t *testing.T, handlers []TestRequestHandler, clientCAPath server.TLS = &tls.Config{ Certificates: []tls.Certificate{cer}, - MinVersion: tls.VersionTLS12, + MinVersion: tls.VersionTLS12, } server.TLS.BuildNameToCertificate() @@ -80,11 +88,9 @@ func StartHttpsServer(t *testing.T, handlers []TestRequestHandler, clientCAPath server.StartTLS() - return server.URL, server.Close -} + t.Cleanup(func() { server.Close() }) -func cleanupSocket() { - os.RemoveAll(tempDir) + return server.URL } func buildHandler(handlers []TestRequestHandler) http.Handler { @@ -4,7 +4,7 @@ go 1.13 require ( github.com/mattn/go-shellwords v1.0.11 - github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect + github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a github.com/otiai10/copy v1.4.2 github.com/prometheus/client_golang v1.9.0 github.com/sirupsen/logrus v1.7.0 diff --git a/internal/command/authorizedkeys/authorized_keys_test.go b/internal/command/authorizedkeys/authorized_keys_test.go index ab44580..7048b57 100644 --- a/internal/command/authorizedkeys/authorized_keys_test.go +++ b/internal/command/authorizedkeys/authorized_keys_test.go @@ -43,8 +43,7 @@ var ( ) func TestExecute(t *testing.T) { - url, cleanup := testserver.StartSocketHttpServer(t, requests) - defer cleanup() + url := testserver.StartSocketHttpServer(t, requests) defaultConfig := &config.Config{RootDir: "/tmp", GitlabUrl: url} diff --git a/internal/command/discover/discover_test.go b/internal/command/discover/discover_test.go index 5431410..7989c27 100644 --- a/internal/command/discover/discover_test.go +++ b/internal/command/discover/discover_test.go @@ -45,8 +45,7 @@ var ( ) func TestExecute(t *testing.T) { - url, cleanup := testserver.StartSocketHttpServer(t, requests) - defer cleanup() + url := testserver.StartSocketHttpServer(t, requests) testCases := []struct { desc string @@ -93,8 +92,7 @@ func TestExecute(t *testing.T) { } func TestFailingExecute(t *testing.T) { - url, cleanup := testserver.StartSocketHttpServer(t, requests) - defer cleanup() + url := testserver.StartSocketHttpServer(t, requests) testCases := []struct { desc string diff --git a/internal/command/healthcheck/healthcheck_test.go b/internal/command/healthcheck/healthcheck_test.go index d05e563..c010c17 100644 --- a/internal/command/healthcheck/healthcheck_test.go +++ b/internal/command/healthcheck/healthcheck_test.go @@ -45,8 +45,7 @@ func buildTestHandlers(code int, rsp *healthcheck.Response) []testserver.TestReq } func TestExecute(t *testing.T) { - url, cleanup := testserver.StartSocketHttpServer(t, okHandlers) - defer cleanup() + url := testserver.StartSocketHttpServer(t, okHandlers) buffer := &bytes.Buffer{} cmd := &Command{ @@ -61,8 +60,7 @@ func TestExecute(t *testing.T) { } func TestFailingRedisExecute(t *testing.T) { - url, cleanup := testserver.StartSocketHttpServer(t, badRedisHandlers) - defer cleanup() + url := testserver.StartSocketHttpServer(t, badRedisHandlers) buffer := &bytes.Buffer{} cmd := &Command{ @@ -76,8 +74,7 @@ func TestFailingRedisExecute(t *testing.T) { } func TestFailingAPIExecute(t *testing.T) { - url, cleanup := testserver.StartSocketHttpServer(t, brokenHandlers) - defer cleanup() + url := testserver.StartSocketHttpServer(t, brokenHandlers) buffer := &bytes.Buffer{} cmd := &Command{ diff --git a/internal/command/lfsauthenticate/lfsauthenticate_test.go b/internal/command/lfsauthenticate/lfsauthenticate_test.go index 55998ab..63aecb0 100644 --- a/internal/command/lfsauthenticate/lfsauthenticate_test.go +++ b/internal/command/lfsauthenticate/lfsauthenticate_test.go @@ -21,8 +21,7 @@ import ( func TestFailedRequests(t *testing.T) { requests := requesthandlers.BuildDisallowedByApiHandlers(t) - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) testCases := []struct { desc string @@ -118,8 +117,7 @@ func TestLfsAuthenticateRequests(t *testing.T) { }, } - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) testCases := []struct { desc string diff --git a/internal/command/personalaccesstoken/personalaccesstoken_test.go b/internal/command/personalaccesstoken/personalaccesstoken_test.go index aa56ce9..37d5ae7 100644 --- a/internal/command/personalaccesstoken/personalaccesstoken_test.go +++ b/internal/command/personalaccesstoken/personalaccesstoken_test.go @@ -71,8 +71,7 @@ const ( func TestExecute(t *testing.T) { setup(t) - url, cleanup := testserver.StartSocketHttpServer(t, requests) - defer cleanup() + url := testserver.StartSocketHttpServer(t, requests) testCases := []struct { desc string diff --git a/internal/command/receivepack/gitalycall_test.go b/internal/command/receivepack/gitalycall_test.go index d756248..9a1019d 100644 --- a/internal/command/receivepack/gitalycall_test.go +++ b/internal/command/receivepack/gitalycall_test.go @@ -19,12 +19,10 @@ import ( ) func TestReceivePack(t *testing.T) { - gitalyAddress, _, cleanup := testserver.StartGitalyServer(t) - defer cleanup() + gitalyAddress, _ := testserver.StartGitalyServer(t) requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) testCases := []struct { username string diff --git a/internal/command/receivepack/receivepack_test.go b/internal/command/receivepack/receivepack_test.go index 44cb680..0f23492 100644 --- a/internal/command/receivepack/receivepack_test.go +++ b/internal/command/receivepack/receivepack_test.go @@ -16,23 +16,21 @@ import ( func TestForbiddenAccess(t *testing.T) { requests := requesthandlers.BuildDisallowedByApiHandlers(t) - cmd, _, cleanup := setup(t, "disallowed", requests) - defer cleanup() + cmd, _ := setup(t, "disallowed", requests) err := cmd.Execute(context.Background()) require.Equal(t, "Disallowed by API call", err.Error()) } func TestCustomReceivePack(t *testing.T) { - cmd, output, cleanup := setup(t, "1", requesthandlers.BuildAllowedWithCustomActionsHandlers(t)) - defer cleanup() + cmd, output := setup(t, "1", requesthandlers.BuildAllowedWithCustomActionsHandlers(t)) require.NoError(t, cmd.Execute(context.Background())) require.Equal(t, "customoutput", output.String()) } -func setup(t *testing.T, keyId string, requests []testserver.TestRequestHandler) (*Command, *bytes.Buffer, func()) { - url, cleanup := testserver.StartSocketHttpServer(t, requests) +func setup(t *testing.T, keyId string, requests []testserver.TestRequestHandler) (*Command, *bytes.Buffer) { + url := testserver.StartSocketHttpServer(t, requests) output := &bytes.Buffer{} input := bytes.NewBufferString("input") @@ -43,5 +41,5 @@ func setup(t *testing.T, keyId string, requests []testserver.TestRequestHandler) ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input}, } - return cmd, output, cleanup + return cmd, output } diff --git a/internal/command/shared/accessverifier/accessverifier_test.go b/internal/command/shared/accessverifier/accessverifier_test.go index 8ad87b8..8e0b5f9 100644 --- a/internal/command/shared/accessverifier/accessverifier_test.go +++ b/internal/command/shared/accessverifier/accessverifier_test.go @@ -22,7 +22,7 @@ var ( action = commandargs.ReceivePack ) -func setup(t *testing.T) (*Command, *bytes.Buffer, *bytes.Buffer, func()) { +func setup(t *testing.T) (*Command, *bytes.Buffer, *bytes.Buffer) { requests := []testserver.TestRequestHandler{ { Path: "/api/v4/internal/allowed", @@ -50,7 +50,7 @@ func setup(t *testing.T) (*Command, *bytes.Buffer, *bytes.Buffer, func()) { }, } - url, cleanup := testserver.StartSocketHttpServer(t, requests) + url := testserver.StartSocketHttpServer(t, requests) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} @@ -58,12 +58,11 @@ func setup(t *testing.T) (*Command, *bytes.Buffer, *bytes.Buffer, func()) { readWriter := &readwriter.ReadWriter{Out: outBuf, ErrOut: errBuf} cmd := &Command{Config: &config.Config{GitlabUrl: url}, ReadWriter: readWriter} - return cmd, errBuf, outBuf, cleanup + return cmd, errBuf, outBuf } func TestMissingUser(t *testing.T) { - cmd, _, _, cleanup := setup(t) - defer cleanup() + cmd, _, _ := setup(t) cmd.Args = &commandargs.Shell{GitlabKeyId: "2"} _, err := cmd.Verify(context.Background(), action, repo) @@ -72,8 +71,7 @@ func TestMissingUser(t *testing.T) { } func TestConsoleMessages(t *testing.T) { - cmd, errBuf, outBuf, cleanup := setup(t) - defer cleanup() + cmd, errBuf, outBuf := setup(t) cmd.Args = &commandargs.Shell{GitlabKeyId: "1"} cmd.Verify(context.Background(), action, repo) diff --git a/internal/command/shared/customaction/customaction_test.go b/internal/command/shared/customaction/customaction_test.go index 119da5b..87ae2e4 100644 --- a/internal/command/shared/customaction/customaction_test.go +++ b/internal/command/shared/customaction/customaction_test.go @@ -54,8 +54,7 @@ func TestExecuteEOFSent(t *testing.T) { }, } - url, cleanup := testserver.StartSocketHttpServer(t, requests) - defer cleanup() + url := testserver.StartSocketHttpServer(t, requests) outBuf := &bytes.Buffer{} errBuf := &bytes.Buffer{} @@ -124,8 +123,7 @@ func TestExecuteNoEOFSent(t *testing.T) { }, } - url, cleanup := testserver.StartSocketHttpServer(t, requests) - defer cleanup() + url := testserver.StartSocketHttpServer(t, requests) outBuf := &bytes.Buffer{} errBuf := &bytes.Buffer{} diff --git a/internal/command/twofactorrecover/twofactorrecover_test.go b/internal/command/twofactorrecover/twofactorrecover_test.go index a53e055..01852f6 100644 --- a/internal/command/twofactorrecover/twofactorrecover_test.go +++ b/internal/command/twofactorrecover/twofactorrecover_test.go @@ -65,8 +65,7 @@ const ( func TestExecute(t *testing.T) { setup(t) - url, cleanup := testserver.StartSocketHttpServer(t, requests) - defer cleanup() + url := testserver.StartSocketHttpServer(t, requests) testCases := []struct { desc string diff --git a/internal/command/twofactorverify/twofactorverify_test.go b/internal/command/twofactorverify/twofactorverify_test.go index 9d5f54d..2e9e0ea 100644 --- a/internal/command/twofactorverify/twofactorverify_test.go +++ b/internal/command/twofactorverify/twofactorverify_test.go @@ -60,8 +60,7 @@ const ( func TestExecute(t *testing.T) { requests := setup(t) - url, cleanup := testserver.StartSocketHttpServer(t, requests) - defer cleanup() + url := testserver.StartSocketHttpServer(t, requests) testCases := []struct { desc string diff --git a/internal/command/uploadarchive/gitalycall_test.go b/internal/command/uploadarchive/gitalycall_test.go index f74093a..03223e9 100644 --- a/internal/command/uploadarchive/gitalycall_test.go +++ b/internal/command/uploadarchive/gitalycall_test.go @@ -18,12 +18,10 @@ import ( ) func TestUploadPack(t *testing.T) { - gitalyAddress, _, cleanup := testserver.StartGitalyServer(t) - defer cleanup() + gitalyAddress, _ := testserver.StartGitalyServer(t) requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) output := &bytes.Buffer{} input := &bytes.Buffer{} diff --git a/internal/command/uploadarchive/uploadarchive_test.go b/internal/command/uploadarchive/uploadarchive_test.go index 5426569..c42c715 100644 --- a/internal/command/uploadarchive/uploadarchive_test.go +++ b/internal/command/uploadarchive/uploadarchive_test.go @@ -16,8 +16,7 @@ import ( func TestForbiddenAccess(t *testing.T) { requests := requesthandlers.BuildDisallowedByApiHandlers(t) - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) output := &bytes.Buffer{} diff --git a/internal/command/uploadpack/gitalycall_test.go b/internal/command/uploadpack/gitalycall_test.go index e94a628..d945764 100644 --- a/internal/command/uploadpack/gitalycall_test.go +++ b/internal/command/uploadpack/gitalycall_test.go @@ -17,12 +17,10 @@ import ( ) func TestUploadPack(t *testing.T) { - gitalyAddress, testServer, cleanup := testserver.StartGitalyServer(t) - defer cleanup() + gitalyAddress, testServer := testserver.StartGitalyServer(t) requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) output := &bytes.Buffer{} input := &bytes.Buffer{} @@ -42,7 +40,7 @@ func TestUploadPack(t *testing.T) { require.NoError(t, err) require.Equal(t, "UploadPack: "+repo, output.String()) - require.Eventually(t, func() bool{ + require.Eventually(t, func() bool { entries := hook.AllEntries() require.Equal(t, 2, len(entries)) diff --git a/internal/command/uploadpack/uploadpack_test.go b/internal/command/uploadpack/uploadpack_test.go index 20edb57..7b43ded 100644 --- a/internal/command/uploadpack/uploadpack_test.go +++ b/internal/command/uploadpack/uploadpack_test.go @@ -16,8 +16,7 @@ import ( func TestForbiddenAccess(t *testing.T) { requests := requesthandlers.BuildDisallowedByApiHandlers(t) - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) output := &bytes.Buffer{} diff --git a/internal/gitlabnet/accessverifier/client_test.go b/internal/gitlabnet/accessverifier/client_test.go index 3681968..ec566ac 100644 --- a/internal/gitlabnet/accessverifier/client_test.go +++ b/internal/gitlabnet/accessverifier/client_test.go @@ -53,8 +53,7 @@ func buildExpectedResponse(who string) *Response { } func TestSuccessfulResponses(t *testing.T) { - client, cleanup := setup(t, "") - defer cleanup() + client := setup(t, "") testCases := []struct { desc string @@ -84,8 +83,7 @@ func TestSuccessfulResponses(t *testing.T) { } func TestGeoPushGetCustomAction(t *testing.T) { - client, cleanup := setup(t, "responses/allowed_with_push_payload.json") - defer cleanup() + client := setup(t, "responses/allowed_with_push_payload.json") args := &commandargs.Shell{GitlabUsername: "custom"} result, err := client.Verify(context.Background(), args, receivePackAction, repo) @@ -107,8 +105,7 @@ func TestGeoPushGetCustomAction(t *testing.T) { } func TestGeoPullGetCustomAction(t *testing.T) { - client, cleanup := setup(t, "responses/allowed_with_pull_payload.json") - defer cleanup() + client := setup(t, "responses/allowed_with_pull_payload.json") args := &commandargs.Shell{GitlabUsername: "custom"} result, err := client.Verify(context.Background(), args, uploadPackAction, repo) @@ -130,8 +127,7 @@ func TestGeoPullGetCustomAction(t *testing.T) { } func TestErrorResponses(t *testing.T) { - client, cleanup := setup(t, "") - defer cleanup() + client := setup(t, "") testCases := []struct { desc string @@ -166,7 +162,7 @@ func TestErrorResponses(t *testing.T) { } } -func setup(t *testing.T, allowedPayload string) (*Client, func()) { +func setup(t *testing.T, allowedPayload string) *Client { testDirCleanup, err := testhelper.PrepareTestRootDir() require.NoError(t, err) defer testDirCleanup() @@ -227,10 +223,10 @@ func setup(t *testing.T, allowedPayload string) (*Client, func()) { }, } - 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 } diff --git a/internal/gitlabnet/authorizedkeys/client_test.go b/internal/gitlabnet/authorizedkeys/client_test.go index e72840c..073e5c1 100644 --- a/internal/gitlabnet/authorizedkeys/client_test.go +++ b/internal/gitlabnet/authorizedkeys/client_test.go @@ -46,8 +46,7 @@ func init() { } func TestGetByKey(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) result, err := client.GetByKey(context.Background(), "key") require.NoError(t, err) @@ -55,8 +54,7 @@ func TestGetByKey(t *testing.T) { } func TestGetByKeyErrorResponses(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) testCases := []struct { desc string @@ -95,11 +93,11 @@ func TestGetByKeyErrorResponses(t *testing.T) { } } -func setup(t *testing.T) (*Client, func()) { - url, cleanup := testserver.StartSocketHttpServer(t, requests) +func setup(t *testing.T) *Client { + url := testserver.StartSocketHttpServer(t, requests) client, err := NewClient(&config.Config{GitlabUrl: url}) require.NoError(t, err) - return client, cleanup + return client } diff --git a/internal/gitlabnet/discover/client_test.go b/internal/gitlabnet/discover/client_test.go index d1b5039..ef35053 100644 --- a/internal/gitlabnet/discover/client_test.go +++ b/internal/gitlabnet/discover/client_test.go @@ -57,8 +57,7 @@ func init() { } func TestGetByKeyId(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) params := url.Values{} params.Add("key_id", "1") @@ -68,8 +67,7 @@ func TestGetByKeyId(t *testing.T) { } func TestGetByUsername(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) params := url.Values{} params.Add("username", "jane-doe") @@ -79,8 +77,7 @@ func TestGetByUsername(t *testing.T) { } func TestMissingUser(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) params := url.Values{} params.Add("username", "missing") @@ -90,8 +87,7 @@ func TestMissingUser(t *testing.T) { } func TestErrorResponses(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) testCases := []struct { desc string @@ -127,11 +123,11 @@ func TestErrorResponses(t *testing.T) { } } -func setup(t *testing.T) (*Client, func()) { - url, cleanup := testserver.StartSocketHttpServer(t, requests) +func setup(t *testing.T) *Client { + url := testserver.StartSocketHttpServer(t, requests) client, err := NewClient(&config.Config{GitlabUrl: url}) require.NoError(t, err) - return client, cleanup + return client } diff --git a/internal/gitlabnet/healthcheck/client_test.go b/internal/gitlabnet/healthcheck/client_test.go index 81ae209..f2a817d 100644 --- a/internal/gitlabnet/healthcheck/client_test.go +++ b/internal/gitlabnet/healthcheck/client_test.go @@ -31,19 +31,18 @@ var ( ) func TestCheck(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) result, err := client.Check(context.Background()) require.NoError(t, err) require.Equal(t, testResponse, result) } -func setup(t *testing.T) (*Client, func()) { - url, cleanup := testserver.StartSocketHttpServer(t, requests) +func setup(t *testing.T) *Client { + url := testserver.StartSocketHttpServer(t, requests) client, err := NewClient(&config.Config{GitlabUrl: url}) require.NoError(t, err) - return client, cleanup + return client } diff --git a/internal/gitlabnet/lfsauthenticate/client_test.go b/internal/gitlabnet/lfsauthenticate/client_test.go index 2bd0451..d554cac 100644 --- a/internal/gitlabnet/lfsauthenticate/client_test.go +++ b/internal/gitlabnet/lfsauthenticate/client_test.go @@ -54,8 +54,7 @@ func setup(t *testing.T) []testserver.TestRequestHandler { func TestFailedRequests(t *testing.T) { requests := setup(t) - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) testCases := []struct { desc string @@ -96,8 +95,7 @@ func TestFailedRequests(t *testing.T) { func TestSuccessfulRequests(t *testing.T) { requests := setup(t) - url, cleanup := testserver.StartHttpServer(t, requests) - defer cleanup() + url := testserver.StartHttpServer(t, requests) testCases := []struct { desc string 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 } diff --git a/internal/gitlabnet/twofactorrecover/client_test.go b/internal/gitlabnet/twofactorrecover/client_test.go index 55656a8..62f88dc 100644 --- a/internal/gitlabnet/twofactorrecover/client_test.go +++ b/internal/gitlabnet/twofactorrecover/client_test.go @@ -81,8 +81,7 @@ func initialize(t *testing.T) { } func TestGetRecoveryCodesByKeyId(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) args := &commandargs.Shell{GitlabKeyId: "0"} result, err := client.GetRecoveryCodes(context.Background(), args) @@ -91,8 +90,7 @@ func TestGetRecoveryCodesByKeyId(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.GetRecoveryCodes(context.Background(), args) @@ -101,8 +99,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.GetRecoveryCodes(context.Background(), args) @@ -110,8 +107,7 @@ func TestMissingUser(t *testing.T) { } func TestErrorResponses(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) testCases := []struct { desc string @@ -146,12 +142,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 } diff --git a/internal/gitlabnet/twofactorverify/client_test.go b/internal/gitlabnet/twofactorverify/client_test.go index 7bb037e..9893b12 100644 --- a/internal/gitlabnet/twofactorverify/client_test.go +++ b/internal/gitlabnet/twofactorverify/client_test.go @@ -81,8 +81,7 @@ const ( ) func TestVerifyOTPByKeyId(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) args := &commandargs.Shell{GitlabKeyId: "0"} err := client.VerifyOTP(context.Background(), args, otpAttempt) @@ -90,8 +89,7 @@ func TestVerifyOTPByKeyId(t *testing.T) { } func TestVerifyOTPByUsername(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) args := &commandargs.Shell{GitlabUsername: "jane-doe"} err := client.VerifyOTP(context.Background(), args, otpAttempt) @@ -99,8 +97,7 @@ func TestVerifyOTPByUsername(t *testing.T) { } func TestErrorMessage(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) args := &commandargs.Shell{GitlabKeyId: "1"} err := client.VerifyOTP(context.Background(), args, otpAttempt) @@ -108,8 +105,7 @@ func TestErrorMessage(t *testing.T) { } func TestErrorResponses(t *testing.T) { - client, cleanup := setup(t) - defer cleanup() + client := setup(t) testCases := []struct { desc string @@ -143,12 +139,12 @@ func TestErrorResponses(t *testing.T) { } } -func setup(t *testing.T) (*Client, func()) { +func setup(t *testing.T) *Client { requests := 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 } diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 5e98c1c..7361cbb 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -111,7 +111,7 @@ func WaitForLogEvent(hook *test.Hook) bool { return true } - time.Sleep(100*time.Millisecond) + time.Sleep(100 * time.Millisecond) } return false |