diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2022-07-18 16:17:51 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2022-07-18 16:17:51 +0300 |
| commit | a454dd8c911101edb4d1d7b8218301584ea199e7 (patch) | |
| tree | f6ff89719b3ad0ffd51e06afaa808fe73ebf4c4e | |
| parent | c8e64964f24174f3204d2379e463912a8f110a23 (diff) | |
| parent | 9b61635bca8f59cf4d21253cacd61c9b5525ef1e (diff) | |
Merge branch 'pks-git-updateref-more-v2.33.0-skipping' into 'master'
updateref: Skip another known-flaky test with Git v2.33.0
See merge request gitlab-org/gitaly!4721
| -rw-r--r-- | internal/git/updateref/updateref_test.go | 6 |
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()) |