mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-15 15:19:36 +01:00
Merge pull request '[v7.0/forgejo] [TESTS] fix flacky git check-attr subtest' (#2975) from bp-v7.0/forgejo-cef39b2 into v7.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2975 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
commit
69d9d66dda
1 changed files with 6 additions and 1 deletions
|
@ -229,7 +229,12 @@ func TestGitAttributeCheckerError(t *testing.T) {
|
|||
assert.NoError(t, os.RemoveAll(gitRepo.Path))
|
||||
|
||||
_, err = ac.CheckPath("i-am-a-python.p")
|
||||
assert.Error(t, err)
|
||||
if err == nil {
|
||||
t.Skip(
|
||||
"git check-attr started too fast and CheckPath was succesful (and likely cached)",
|
||||
"https://codeberg.org/forgejo/forgejo/issues/2948",
|
||||
)
|
||||
}
|
||||
// Depending on the order of execution, the returned error can be:
|
||||
// - a launch error "fork/exec /usr/bin/git: no such file or directory" (when the removal happens before the Run)
|
||||
// - a git error (stderr: "fatal: Unable to read current working directory: No such file or directory"): exit status 128 (when the removal happens after the Run)
|
||||
|
|
Loading…
Reference in a new issue