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/ssh_key_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/ssh_key_test.go')
| -rw-r--r-- | integrations/ssh_key_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/integrations/ssh_key_test.go b/integrations/ssh_key_test.go index d445c7f9e5..91774f6335 100644 --- a/integrations/ssh_key_test.go +++ b/integrations/ssh_key_test.go @@ -9,13 +9,13 @@ import ( "io/ioutil" "net/http" "net/url" - "os" "path/filepath" "testing" "time" "code.gitea.io/gitea/modules/git" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" ) @@ -63,7 +63,7 @@ func testPushDeployKeyOnEmptyRepo(t *testing.T, u *url.URL) { // Setup the testing repository dstPath, err := ioutil.TempDir("", "repo-tmp-deploy-key-empty-repo-1") assert.NoError(t, err) - defer os.RemoveAll(dstPath) + defer util.RemoveAll(dstPath) t.Run("InitTestRepository", doGitInitTestRepository(dstPath)) @@ -109,7 +109,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) { t.Run("KeyCanOnlyBeUser", func(t *testing.T) { dstPath, err := ioutil.TempDir("", ctx.Reponame) assert.NoError(t, err) - defer os.RemoveAll(dstPath) + defer util.RemoveAll(dstPath) sshURL := createSSHUrl(ctx.GitPath(), u) @@ -135,7 +135,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) { t.Run("KeyCanBeAnyDeployButNotUserAswell", func(t *testing.T) { dstPath, err := ioutil.TempDir("", ctx.Reponame) assert.NoError(t, err) - defer os.RemoveAll(dstPath) + defer util.RemoveAll(dstPath) sshURL := createSSHUrl(ctx.GitPath(), u) @@ -153,7 +153,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) { otherSSHURL := createSSHUrl(otherCtx.GitPath(), u) dstOtherPath, err := ioutil.TempDir("", otherCtx.Reponame) assert.NoError(t, err) - defer os.RemoveAll(dstOtherPath) + defer util.RemoveAll(dstOtherPath) t.Run("AddWriterDeployKeyToOther", doAPICreateDeployKey(otherCtx, keyname, keyFile, false)) @@ -170,7 +170,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) { otherSSHURL := createSSHUrl(otherCtx.GitPath(), u) dstOtherPath, err := ioutil.TempDir("", otherCtx.Reponame) assert.NoError(t, err) - defer os.RemoveAll(dstOtherPath) + defer util.RemoveAll(dstOtherPath) t.Run("DeleteRepository", doAPIDeleteRepository(ctx)) @@ -192,7 +192,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) { dstPath, err := ioutil.TempDir("", ctx.Reponame) assert.NoError(t, err) - defer os.RemoveAll(dstPath) + defer util.RemoveAll(dstPath) sshURL := createSSHUrl(ctx.GitPath(), u) |