Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlo Strokov <pstrokov@gitlab.com>2021-04-15 09:44:55 +0300
committerPavlo Strokov <pstrokov@gitlab.com>2021-04-20 10:09:05 +0300
commit9d3b80540cc9c5c74664b72706fea6c17edbf205 (patch)
tree59b90afb7a723b4eb78b6766c0a3c1109199ca56
parent88cf3df66aabfaa5a4a0cb2a06a144e5f033e0dc (diff)
Use GitalyServersMetadataFromCfg in operations package
Replace GitalyServersMetadata with the new GitalyServersMetadataFromCfg.
-rw-r--r--internal/gitaly/service/operations/commit_files_test.go2
-rw-r--r--internal/gitaly/service/operations/testhelper_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitaly/service/operations/commit_files_test.go b/internal/gitaly/service/operations/commit_files_test.go
index 61cd00faa..c769d7460 100644
--- a/internal/gitaly/service/operations/commit_files_test.go
+++ b/internal/gitaly/service/operations/commit_files_test.go
@@ -945,7 +945,7 @@ func TestUserCommitFilesStableCommitID(t *testing.T) {
defer cleanup()
repo := localrepo.New(git.NewExecCommandFactory(cfg), repoProto, cfg)
- for key, values := range testhelper.GitalyServersMetadata(t, cfg.SocketPath) {
+ for key, values := range testhelper.GitalyServersMetadataFromCfg(t, cfg) {
for _, value := range values {
ctx = metadata.AppendToOutgoingContext(ctx, key, value)
}
diff --git a/internal/gitaly/service/operations/testhelper_test.go b/internal/gitaly/service/operations/testhelper_test.go
index 94bf6afc1..9333823ac 100644
--- a/internal/gitaly/service/operations/testhelper_test.go
+++ b/internal/gitaly/service/operations/testhelper_test.go
@@ -162,7 +162,7 @@ func setupOperationsServiceWithRuby(
client, conn := newOperationClient(t, serverSocketPath)
t.Cleanup(func() { conn.Close() })
- md := testhelper.GitalyServersMetadata(t, cfg.SocketPath)
+ md := testhelper.GitalyServersMetadataFromCfg(t, cfg)
ctx = testhelper.MergeOutgoingMetadata(ctx, md)
return ctx, cfg, repo, repoPath, client