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 /routers/repo/settings_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 'routers/repo/settings_test.go')
| -rw-r--r-- | routers/repo/settings_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/repo/settings_test.go b/routers/repo/settings_test.go index 2325c0255c..97c3fb0471 100644 --- a/routers/repo/settings_test.go +++ b/routers/repo/settings_test.go @@ -7,7 +7,6 @@ package repo import ( "io/ioutil" "net/http" - "os" "testing" "code.gitea.io/gitea/models" @@ -15,6 +14,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/test" + "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" ) @@ -31,7 +31,7 @@ func createSSHAuthorizedKeysTmpPath(t *testing.T) func() { return func() { setting.SSH.RootPath = oldPath - os.RemoveAll(tmpDir) + util.RemoveAll(tmpDir) } } |