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/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/git_test.go')
| -rw-r--r-- | integrations/git_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/integrations/git_test.go b/integrations/git_test.go index 7dd0bc056f..c3c1126829 100644 --- a/integrations/git_test.go +++ b/integrations/git_test.go @@ -10,7 +10,6 @@ import ( "math/rand" "net/http" "net/url" - "os" "path" "path/filepath" "strconv" @@ -21,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" ) @@ -51,7 +51,7 @@ func testGit(t *testing.T, u *url.URL) { dstPath, err := ioutil.TempDir("", httpContext.Reponame) assert.NoError(t, err) - defer os.RemoveAll(dstPath) + defer util.RemoveAll(dstPath) t.Run("CreateRepoInDifferentUser", doAPICreateRepository(forkedUserCtx, false)) t.Run("AddUserAsCollaborator", doAPIAddCollaborator(forkedUserCtx, httpContext.Username, models.AccessModeRead)) @@ -99,7 +99,7 @@ func testGit(t *testing.T, u *url.URL) { //Setup clone folder dstPath, err := ioutil.TempDir("", sshContext.Reponame) assert.NoError(t, err) - defer os.RemoveAll(dstPath) + defer util.RemoveAll(dstPath) t.Run("Clone", doGitClone(dstPath, sshURL)) @@ -124,7 +124,7 @@ func testGit(t *testing.T, u *url.URL) { func ensureAnonymousClone(t *testing.T, u *url.URL) { dstLocalPath, err := ioutil.TempDir("", "repo1") assert.NoError(t, err) - defer os.RemoveAll(dstLocalPath) + defer util.RemoveAll(dstLocalPath) t.Run("CloneAnonymous", doGitClone(dstLocalPath, u)) } @@ -498,7 +498,7 @@ func doPushCreate(ctx APITestContext, u *url.URL) func(t *testing.T) { // Create a temporary directory tmpDir, err := ioutil.TempDir("", ctx.Reponame) assert.NoError(t, err) - defer os.RemoveAll(tmpDir) + defer util.RemoveAll(tmpDir) // Now create local repository to push as our test and set its origin t.Run("InitTestRepository", doGitInitTestRepository(tmpDir)) |