diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-09-29 09:25:57 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-09-29 09:25:57 +0300 |
| commit | b4328031b8bb05d5ae46e2dc94ccc7764b58e55b (patch) | |
| tree | 2b9bca5924aaf6c6582a46a98c58554025ab3e36 /internal | |
| parent | 084fbf44937c6e818e67dbffbf6c1184febee418 (diff) | |
| parent | 3dc0291f68bbdf9eabd1733fd4672198cb8227be (diff) | |
Merge branch 'pks-updateref-flakiness-pt2' into 'master'
updateref: Fix test flakiness depending on when git-update-ref(1) exits
See merge request gitlab-org/gitaly!3911
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/git/updateref/updateref_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/git/updateref/updateref_test.go b/internal/git/updateref/updateref_test.go index 3668821fe..c2cf6c0d6 100644 --- a/internal/git/updateref/updateref_test.go +++ b/internal/git/updateref/updateref_test.go @@ -159,7 +159,7 @@ func TestUpdater_concurrentLocking(t *testing.T) { if gitSupportsStatusFlushing(t, ctx, cfg) { err := secondUpdater.Prepare() require.Error(t, err) - require.Contains(t, err.Error(), "state update to \"prepare\" failed: EOF, stderr: \"warning: update refs/heads/master: missing <newvalue>, treating as zero\\nfatal: prepare: cannot lock ref 'refs/heads/master'") + require.Contains(t, err.Error(), "fatal: prepare: cannot lock ref 'refs/heads/master'") require.NoError(t, firstUpdater.Commit()) } else { @@ -168,7 +168,7 @@ func TestUpdater_concurrentLocking(t *testing.T) { err := secondUpdater.Commit() require.Error(t, err) - require.Contains(t, err.Error(), "git update-ref: exit status 128, stderr: \"warning: update refs/heads/master: missing <newvalue>, treating as zero\\nfatal: prepare: cannot lock ref 'refs/heads/master'") + require.Contains(t, err.Error(), "fatal: prepare: cannot lock ref 'refs/heads/master'") } } |