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:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-07-18 15:13:54 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-07-18 15:13:54 +0300
commit9b61635bca8f59cf4d21253cacd61c9b5525ef1e (patch)
treef6ff89719b3ad0ffd51e06afaa808fe73ebf4c4e
parentc8e64964f24174f3204d2379e463912a8f110a23 (diff)
updateref: Skip another known-flaky test with Git v2.33.0
In 53944694c (updateref: Skip known-flaky test with Git v2.33.0, 2022-07-08) we have started to skip a test that's known to be flaky with Git v2.33.0 or older. While this test is not flaking anymore, we're now regularly seeing a similar flake in another test. This new flaky test is related to cancellation, but it also does the same `Prepare()` step and expects that to properly lock the references, which is not guaranteed by Git v2.33.0. Skip this test as well to decrease flakiness.
-rw-r--r--internal/git/updateref/updateref_test.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/internal/git/updateref/updateref_test.go b/internal/git/updateref/updateref_test.go
index cdaf0e9e9..d48a75432 100644
--- a/internal/git/updateref/updateref_test.go
+++ b/internal/git/updateref/updateref_test.go
@@ -202,7 +202,11 @@ func TestContextCancelAbortsRefChanges(t *testing.T) {
func TestUpdater_cancel(t *testing.T) {
ctx := testhelper.Context(t)
- _, repo, updater := setupUpdater(t, ctx)
+ cfg, repo, updater := setupUpdater(t, ctx)
+
+ if !gitSupportsStatusFlushing(t, ctx, cfg) {
+ t.Skip("git does not support flushing yet, which is known to be flaky")
+ }
require.NoError(t, updater.Delete(git.ReferenceName("refs/heads/master")))
require.NoError(t, updater.Prepare())