diff options
| author | Toon Claes <toon@gitlab.com> | 2023-05-16 10:11:58 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2023-05-16 10:11:58 +0300 |
| commit | e804aa91458f3d02d629d6f061456d50ab9679fa (patch) | |
| tree | 334aa67ec942c1423a12e3aa9355168b0abd08cf | |
| parent | b35d3d65b6314acf2a8667b06fe4f30b9a6d4d1a (diff) | |
| parent | ef4b22c394cb11ee87bc8bd6c580f71f84374871 (diff) | |
Merge branch 'jt-quarantine-flaky-test' into 'master'
gitaly-hooks: Quarantine flaky test
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5793
Merged-by: Toon Claes <toon@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Co-authored-by: Justin Tobler <jtobler@gitlab.com>
| -rw-r--r-- | cmd/gitaly-hooks/hooks_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index a4b7fac04..782f81128 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -787,7 +787,9 @@ remote: error executing git hook t.Run(tc.name, func(t *testing.T) { testhelper.SkipQuarantinedTest(t, "https://gitlab.com/gitlab-org/gitaly/-/issues/5105", - "TestGitalyServerReturnsError_packObjects/resource_exhausted_with_LimitError_detail") + "TestGitalyServerReturnsError_packObjects/resource_exhausted_with_LimitError_detail", + "TestGitalyServerReturnsError_packObjects/resource_exhausted_without_LimitError_detail", + ) logDir := testhelper.TempDir(t) |