diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2021-03-17 21:18:42 +0300 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2021-03-17 21:23:07 +0300 |
| commit | ee41d0dfb7b02a19f5926bfe24dbad1df417a29e (patch) | |
| tree | 130f2777342645018f3f6b797ee0083d65910889 /internal/command/uploadpack | |
| parent | 4b40a2cb8c71a5b490cad4c8e1ad2dc0e9b39548 (diff) | |
| download | gitlab-shell-ee41d0dfb7b02a19f5926bfe24dbad1df417a29e.tar.gz | |
Replace cleanup functions with t.Cleanup
In this case we don't need to propagate cleanup
function. It simplifies the code.
Diffstat (limited to 'internal/command/uploadpack')
| -rw-r--r-- | internal/command/uploadpack/gitalycall_test.go | 8 | ||||
| -rw-r--r-- | internal/command/uploadpack/uploadpack_test.go | 3 |
2 files changed, 4 insertions, 7 deletions
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{} |