diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-05-14 09:24:17 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-05-14 09:24:17 +0300 |
| commit | 8f48e121a8ccce4115d0a5c0d9e3e52422364ebb (patch) | |
| tree | d8500fe382340665f138140b24f8f6b0b8f8364e | |
| parent | 3129b16930c1a0b1afe19b05a31c3195073de12b (diff) | |
| parent | 80dfbdb2b77f9d764b612ae203733a5b82b8e7ed (diff) | |
Merge branch 'pks-operations-testhelper-cfg-dep' into 'master'
operations: Fix use of wrong config to construct test servers
See merge request gitlab-org/gitaly!3489
| -rw-r--r-- | internal/gitaly/service/operations/testhelper_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/gitaly/service/operations/testhelper_test.go b/internal/gitaly/service/operations/testhelper_test.go index 973d09ead..87b170dc0 100644 --- a/internal/gitaly/service/operations/testhelper_test.go +++ b/internal/gitaly/service/operations/testhelper_test.go @@ -139,7 +139,7 @@ func runOperationServiceServer(t testing.TB, cfg config.Cfg, rubySrv *rubyserver )) gitalypb.RegisterHookServiceServer(srv, hook.NewServer(cfg, deps.GetHookManager(), deps.GetGitCmdFactory())) gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer( - cfg, + deps.GetCfg(), rubySrv, deps.GetLocator(), deps.GetTxManager(), @@ -147,21 +147,21 @@ func runOperationServiceServer(t testing.TB, cfg config.Cfg, rubySrv *rubyserver deps.GetCatfileCache(), )) gitalypb.RegisterRefServiceServer(srv, ref.NewServer( - cfg, + deps.GetCfg(), deps.GetLocator(), deps.GetGitCmdFactory(), deps.GetTxManager(), deps.GetCatfileCache(), )) gitalypb.RegisterCommitServiceServer(srv, commit.NewServer( - cfg, + deps.GetCfg(), deps.GetLocator(), deps.GetGitCmdFactory(), nil, deps.GetCatfileCache(), )) gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer( - cfg, + deps.GetCfg(), deps.GetLocator(), deps.GetGitCmdFactory(), deps.GetTxManager(), |