diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-09-29 09:53:52 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-09-29 09:53:52 +0300 |
| commit | 5cba52f4acb04ddbe27d8b7cb2e936ea0be45ae1 (patch) | |
| tree | dcb91fdd068fa67806cc7ba752ab1702f6e569a8 | |
| parent | 6d4ebb397a85b0b1d1784e6946f51f4dab5ac925 (diff) | |
| parent | d08e0fe0028a6b52d597e854bd467331d442cad9 (diff) | |
Merge branch 'wc/track-repos-logger-race' into 'master'
praefect: fix race condition on logger
Closes #4457 and #4473
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4886
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Co-authored-by: Will Chandler <wchandler@gitlab.com>
| -rw-r--r-- | cmd/praefect/subcmd_track_repositories_test.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd/praefect/subcmd_track_repositories_test.go b/cmd/praefect/subcmd_track_repositories_test.go index c644f88d2..ed9737864 100644 --- a/cmd/praefect/subcmd_track_repositories_test.go +++ b/cmd/praefect/subcmd_track_repositories_test.go @@ -37,8 +37,9 @@ func TestAddRepositories_FlagSet(t *testing.T) { require.Equal(t, true, cmd.replicateImmediately) } +// Cannot be run with t.Parallel() due to races on global logger +// Cleanup tracked under https://gitlab.com/gitlab-org/gitaly/-/issues/4500 func TestAddRepositories_Exec_invalidInput(t *testing.T) { - t.Parallel() g1Cfg := testcfg.Build(t, testcfg.WithStorages("gitaly-1")) g2Cfg := testcfg.Build(t, testcfg.WithStorages("gitaly-2")) @@ -194,8 +195,9 @@ func TestAddRepositories_Exec_invalidInput(t *testing.T) { } } +// Cannot be run with t.Parallel() due to races on global logger +// Cleanup tracked under https://gitlab.com/gitlab-org/gitaly/-/issues/4500 func TestAddRepositories_Exec(t *testing.T) { - t.Parallel() g1Cfg := testcfg.Build(t, testcfg.WithStorages("gitaly-1")) g2Cfg := testcfg.Build(t, testcfg.WithStorages("gitaly-2")) testcfg.BuildGitalyHooks(t, g2Cfg) |