diff options
author | Toon Claes <toon@gitlab.com> | 2023-08-11 15:04:58 +0300 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2023-08-11 15:04:58 +0300 |
commit | 9b54beee7632f9034d6e4421ade54d8eafd21bd9 (patch) | |
tree | 84dcd099d4961042a6859fdd6131038e9739881d | |
parent | f0642295283139c5006ae5bc6926bc152290f04e (diff) | |
parent | 921222903cae6b88007abe7ec5083b75d8b6d468 (diff) |
Merge branch 'qmnguyen0711/quarantine-some-tests' into 'master'
Quarantine some flaky tests
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6204
Merged-by: Toon Claes <toon@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Co-authored-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
-rw-r--r-- | internal/limiter/adaptive_calculator_test.go | 2 | ||||
-rw-r--r-- | internal/praefect/repocleaner/repository_test.go | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/internal/limiter/adaptive_calculator_test.go b/internal/limiter/adaptive_calculator_test.go index d4965bdf4..5c2a5dae7 100644 --- a/internal/limiter/adaptive_calculator_test.go +++ b/internal/limiter/adaptive_calculator_test.go @@ -55,6 +55,8 @@ func TestAdaptiveCalculator_realTimerTicker(t *testing.T) { func TestAdaptiveCalculator(t *testing.T) { t.Parallel() + testhelper.SkipQuarantinedTest(t, "https://gitlab.com/gitlab-org/gitaly/-/issues/5467") + tests := []struct { desc string limits []AdaptiveLimiter diff --git a/internal/praefect/repocleaner/repository_test.go b/internal/praefect/repocleaner/repository_test.go index 1282485a8..11fd5e34c 100644 --- a/internal/praefect/repocleaner/repository_test.go +++ b/internal/praefect/repocleaner/repository_test.go @@ -208,6 +208,12 @@ 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 ( |