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:
Earl Warren 2024-04-02 15:09:14 +00:00
commit 69d9d66dda

View file

@ -229,7 +229,12 @@ func TestGitAttributeCheckerError(t *testing.T) {
assert.NoError(t, os.RemoveAll(gitRepo.Path)) assert.NoError(t, os.RemoveAll(gitRepo.Path))
_, err = ac.CheckPath("i-am-a-python.p") _, 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: // 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 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) // - 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)