diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-10-10 13:01:02 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-10-14 13:44:54 +0300 |
| commit | 1881ab188e2789715ad1307fb1748d6c14e72474 (patch) | |
| tree | 5b89a52a44d9e7390208d2f233433dec8629fac4 /internal/gitaly/service/conflicts/testhelper_test.go | |
| parent | 7d88809fa9bac82129b76e472f80e917eb0e3806 (diff) | |
global: Reorder `testing.TB` before `context.Context` arguments
A few weeks ago we have decided that `testing.TB` arguments should be
first, `context.Context` second. This is rather a matter of perssnal
taste instead of correctness, but we should strive for consistency.
Reorder all arguments to match the agreed-upon style.
Diffstat (limited to 'internal/gitaly/service/conflicts/testhelper_test.go')
| -rw-r--r-- | internal/gitaly/service/conflicts/testhelper_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go index d7add6e0b..0c9d3cfa3 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -26,7 +26,7 @@ func TestMain(m *testing.M) { testhelper.Run(m) } -func setupConflictsService(ctx context.Context, tb testing.TB, hookManager hook.Manager) (config.Cfg, *gitalypb.Repository, string, gitalypb.ConflictsServiceClient) { +func setupConflictsService(tb testing.TB, ctx context.Context, hookManager hook.Manager) (config.Cfg, *gitalypb.Repository, string, gitalypb.ConflictsServiceClient) { cfg := testcfg.Build(tb) testcfg.BuildGitalyGit2Go(tb, cfg) @@ -37,7 +37,7 @@ func setupConflictsService(ctx context.Context, tb testing.TB, hookManager hook. client, conn := NewConflictsClient(tb, serverSocketPath) tb.Cleanup(func() { conn.Close() }) - repo, repoPath := gittest.CreateRepository(ctx, tb, cfg, gittest.CreateRepositoryConfig{ + repo, repoPath := gittest.CreateRepository(tb, ctx, cfg, gittest.CreateRepositoryConfig{ Seed: gittest.SeedGitLabTest, }) |