remote: Allow passing testserver options

The remote service setup functions do not accept testserver options,
which makes it impossible to override a subset of dependencies. Refactor
them to accept options.

1 files changed, 4 insertions, 4 deletions

diff --git a/internal/gitaly/service/remote/testhelper_test.go b/internal/gitaly/service/remote/testhelper_test.go
index bc2bf7fa6..0cffc5261 100644
--- a/internal/gitaly/service/remote/testhelper_test.go
+++ b/internal/gitaly/service/remote/testhelper_test.go
@@ -54,7 +54,7 @@ func TestWithRubySidecar(t *testing.T) {
 	}
 }
 
-func setupRemoteServiceWithRuby(t *testing.T, cfg config.Cfg, rubySrv *rubyserver.Server) (config.Cfg, *gitalypb.Repository, string, gitalypb.RemoteServiceClient) {
+func setupRemoteServiceWithRuby(t *testing.T, cfg config.Cfg, rubySrv *rubyserver.Server, opts ...testserver.GitalyServerOpt) (config.Cfg, *gitalypb.Repository, string, gitalypb.RemoteServiceClient) {
 	t.Helper()
 
 	repo, repoPath, cleanup := gittest.CloneRepoAtStorage(t, cfg, cfg.Storages[0], t.Name())
@@ -69,7 +69,7 @@ func setupRemoteServiceWithRuby(t *testing.T, cfg config.Cfg, rubySrv *rubyserve
 			deps.GetCatfileCache(),
 			deps.GetTxManager(),
 		))
-	})
+	}, opts...)
 	cfg.SocketPath = addr
 
 	client, conn := newRemoteClient(t, addr)
@@ -78,11 +78,11 @@ func setupRemoteServiceWithRuby(t *testing.T, cfg config.Cfg, rubySrv *rubyserve
 	return cfg, repo, repoPath, client
 }
 
-func setupRemoteService(t *testing.T) (config.Cfg, *gitalypb.Repository, string, gitalypb.RemoteServiceClient) {
+func setupRemoteService(t *testing.T, opts ...testserver.GitalyServerOpt) (config.Cfg, *gitalypb.Repository, string, gitalypb.RemoteServiceClient) {
 	t.Helper()
 
 	cfg := testcfg.Build(t)
-	return setupRemoteServiceWithRuby(t, cfg, nil)
+	return setupRemoteServiceWithRuby(t, cfg, nil, opts...)
 }
 
 func newRemoteClient(t *testing.T, serverSocketPath string) (gitalypb.RemoteServiceClient, *grpc.ClientConn) {