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/command/receivepack/receivepack_test.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'internal/command/receivepack/receivepack_test.go') 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 } -- cgit v1.2.1