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:
authorWill Chandler <wchandler@gitlab.com>2022-11-10 22:16:40 +0300
committerWill Chandler <wchandler@gitlab.com>2022-11-11 23:59:03 +0300
commit3adc6953cd9545d1608e40df1a023e3c5f02487a (patch)
treeadc0ab01f0efde148861ae4f1f3f581ec53e68c0
parent3575cf2cd506013c7ab03ffebf48cbc0628ba8c3 (diff)
praefect: Make add-repositories tests parallel
Now that the previous commit has removed the global logger from Praefect, re-enable parallel testing for the impacted add-repositories tests. Changelog: fixed
-rw-r--r--cmd/praefect/subcmd_track_repositories_test.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/praefect/subcmd_track_repositories_test.go b/cmd/praefect/subcmd_track_repositories_test.go
index 798ebb478..b683f0f87 100644
--- a/cmd/praefect/subcmd_track_repositories_test.go
+++ b/cmd/praefect/subcmd_track_repositories_test.go
@@ -37,9 +37,8 @@ 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"))
@@ -196,9 +195,8 @@ 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)