diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-05-09 15:48:54 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-05-17 11:58:44 +0300 |
| commit | 717e5d72d212cc3b44462a8ba9734e744779d1c8 (patch) | |
| tree | a761561c25e7c51c6d5ee505d05ed73caee5f203 | |
| parent | b9d60f9accc991a8d05f5679cb5645c1e041c1b2 (diff) | |
Replace MergeOutgoingMetadata with new GitalyServersMetadataFromCfg
The old MergeOutgoingMetadata function uses hardcoded values to
fill the headers for the gRPC request and propagates only a single
address. The new function uses all addresses defined on the context
and no hardcoded values.
| -rw-r--r-- | internal/gitaly/service/conflicts/resolve_conflicts_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index 939a59d17..158c0185c 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -199,7 +199,7 @@ func TestResolveConflictsWithRemoteRepo(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - ctx = testhelper.MergeOutgoingMetadata(ctx, testhelper.GitalyServersMetadata(t, cfg.SocketPath)) + ctx = testhelper.MergeOutgoingMetadata(ctx, testhelper.GitalyServersMetadataFromCfg(t, cfg)) stream, err := client.ResolveConflicts(ctx) require.NoError(t, err) @@ -247,7 +247,7 @@ func TestResolveConflictsLineEndings(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - ctx = testhelper.MergeOutgoingMetadata(ctx, testhelper.GitalyServersMetadata(t, cfg.SocketPath)) + ctx = testhelper.MergeOutgoingMetadata(ctx, testhelper.GitalyServersMetadataFromCfg(t, cfg)) for _, tc := range []struct { desc string |