diff options
| author | Will Chandler <wchandler@gitlab.com> | 2023-09-05 22:00:03 +0300 |
|---|---|---|
| committer | Will Chandler <wchandler@gitlab.com> | 2023-09-05 22:00:03 +0300 |
| commit | ac99040eb019fff769ec82b5cdc8727711df3ce1 (patch) | |
| tree | 3d680bac501a8ea3303793fcd092549707337ea8 | |
| parent | 379100dce25b602ffa830789a5d966002d038f77 (diff) | |
| parent | b11a07a78c57b6ddf93e4123336cb01de82305a6 (diff) | |
Merge branch 'pks-repocleaner-fix-liveness-test-race' into 'master'
repocleaner: Fix test race caused by too low liveness interval
Closes #5504
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6326
Merged-by: Will Chandler <wchandler@gitlab.com>
Approved-by: Sami Hiltunen <shiltunen@gitlab.com>
Approved-by: Will Chandler <wchandler@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | internal/praefect/repocleaner/repository_test.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/internal/praefect/repocleaner/repository_test.go b/internal/praefect/repocleaner/repository_test.go index 83c21ab17..cb4843959 100644 --- a/internal/praefect/repocleaner/repository_test.go +++ b/internal/praefect/repocleaner/repository_test.go @@ -208,12 +208,6 @@ func TestRunner_Run(t *testing.T) { } func TestRunner_Run_noAvailableStorages(t *testing.T) { - testhelper.SkipQuarantinedTest( - t, - "https://gitlab.com/gitlab-org/gitaly/-/issues/5504", - "TestRunner_Run_noAvailableStorages", - ) - t.Parallel() const ( @@ -241,8 +235,8 @@ func TestRunner_Run_noAvailableStorages(t *testing.T) { DB: dbConf, } cfg := Cfg{ - RunInterval: time.Minute, - LivenessInterval: time.Second, + RunInterval: time.Hour, + LivenessInterval: time.Hour, RepositoriesInBatch: 2, } |