Merge branch '671-race-golang-1-x-failed-with-stdin-send-error-eof-2' into 'main'

Use GracefulStop() instead of Stop()

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/951



Merged-by: Patrick Bajao <ebajao@gitlab.com>
Approved-by: Patrick Bajao <ebajao@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>

client/testserver/gitalyserver.go

@@ -130,7 +130,7 @@ func doStartTestServer(t *testing.T, network string, path string) (string, *Test
 	go func() {
 		require.NoError(t, server.Serve(listener))
 	}()
-	t.Cleanup(func() { server.Stop() })
+	t.Cleanup(func() { server.GracefulStop() })
 
 	return listener.Addr().String(), &testServer
 }

internal/command/uploadarchive/uploadarchive_test.go

@@ -22,8 +22,8 @@ func TestAllowedAccess(t *testing.T) {
 	cmd.Config.GitalyClient.InitSidechannelRegistry(context.Background())
 
 	ctxWithLogData, err := cmd.Execute(context.Background())
-
 	require.NoError(t, err)
+
 	data := ctxWithLogData.Value("logData").(command.LogData)
 	require.Equal(t, "alex-doe", data.Username)
 	require.Equal(t, "group/project-path", data.Meta.Project)

internal/command/uploadpack/uploadpack_test.go

@@ -22,8 +22,8 @@ func TestAllowedAccess(t *testing.T) {
 	cmd.Config.GitalyClient.InitSidechannelRegistry(context.Background())
 
 	ctxWithLogData, err := cmd.Execute(context.Background())
-
 	require.NoError(t, err)
+
 	data := ctxWithLogData.Value("logData").(command.LogData)
 	require.Equal(t, "alex-doe", data.Username)
 	require.Equal(t, "group/project-path", data.Meta.Project)