1 files changed, 11 insertions, 39 deletions
diff --git a/internal/gitaly/service/namespace/testhelper_test.go b/internal/gitaly/service/namespace/testhelper_test.go
index fed1f8461..4411cb8c8 100644
--- a/internal/gitaly/service/namespace/testhelper_test.go
+++ b/internal/gitaly/service/namespace/testhelper_test.go
@@ -1,57 +1,29 @@
 package namespace
 
 import (
-	"net"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
-	"gitlab.com/gitlab-org/gitaly/internal/storage"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper/testcfg"
+	"gitlab.com/gitlab-org/gitaly/internal/testhelper/testserver"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/reflection"
 )
 
-func setupNamespaceService(t testing.TB) (config.Cfg, gitalypb.NamespaceServiceClient) {
+func setupNamespaceService(t testing.TB, opts ...testserver.GitalyServerOpt) (config.Cfg, gitalypb.NamespaceServiceClient) {
 	cfgBuilder := testcfg.NewGitalyCfgBuilder(testcfg.WithStorages("default", "other"))
 	cfg := cfgBuilder.Build(t)
 
-	locator := config.NewLocator(cfg)
-	server, serverSocketPath := runNamespaceServer(t, locator)
-	t.Cleanup(server.Stop)
+	addr := testserver.RunGitalyServer(t, cfg, nil, func(srv *grpc.Server, deps *service.Dependencies) {
+		gitalypb.RegisterNamespaceServiceServer(srv, NewServer(deps.GetLocator()))
+	}, opts...)
 
-	client, conn := newNamespaceClient(t, serverSocketPath)
-	t.Cleanup(func() { conn.Close() })
+	conn, err := grpc.Dial(addr, grpc.WithInsecure())
+	require.NoError(t, err)
+	t.Cleanup(func() { testhelper.MustClose(t, conn) })
 
-	return cfg, client
-}
-
-func runNamespaceServer(t testing.TB, locator storage.Locator) (*grpc.Server, string) {
-	server := testhelper.NewTestGrpcServer(t, nil, nil)
-	serverSocketPath := testhelper.GetTemporaryGitalySocketFileName(t)
-
-	listener, err := net.Listen("unix", serverSocketPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	gitalypb.RegisterNamespaceServiceServer(server, NewServer(locator))
-	reflection.Register(server)
-
-	go server.Serve(listener)
-
-	return server, "unix://" + serverSocketPath
-}
-
-func newNamespaceClient(t testing.TB, serverSocketPath string) (gitalypb.NamespaceServiceClient, *grpc.ClientConn) {
-	connOpts := []grpc.DialOption{
-		grpc.WithInsecure(),
-	}
-	conn, err := grpc.Dial(serverSocketPath, connOpts...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return gitalypb.NewNamespaceServiceClient(conn), conn
+	return cfg, gitalypb.NewNamespaceServiceClient(conn)
 }