diff options
| author | zeripath <art27@cantab.net> | 2020-08-11 21:05:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 21:05:34 +0100 |
| commit | 74bd9691c685942798f2761607731697498ceeae (patch) | |
| tree | 531d661263b839ccf8aa6af73bfb6710984f0dd9 /integrations/gpg_git_test.go | |
| parent | faa676cc8b4419ac56fbf9d009ea8c6b79834024 (diff) | |
| download | gitea-74bd9691c685942798f2761607731697498ceeae.tar.gz gitea-74bd9691c685942798f2761607731697498ceeae.zip | |
Re-attempt to delete temporary upload if the file is locked by another process (#12447)
Replace all calls to os.Remove/os.RemoveAll by retrying util.Remove/util.RemoveAll and remove circular dependencies from util.
Fix #12339
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'integrations/gpg_git_test.go')
| -rw-r--r-- | integrations/gpg_git_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/integrations/gpg_git_test.go b/integrations/gpg_git_test.go index e01f0f31c1..8c78faf7d2 100644 --- a/integrations/gpg_git_test.go +++ b/integrations/gpg_git_test.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/armor" @@ -28,7 +29,7 @@ func TestGPGGit(t *testing.T) { // OK Set a new GPG home tmpDir, err := ioutil.TempDir("", "temp-gpg") assert.NoError(t, err) - defer os.RemoveAll(tmpDir) + defer util.RemoveAll(tmpDir) err = os.Chmod(tmpDir, 0700) assert.NoError(t, err) |