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 /modules/queue/queue_disk_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 'modules/queue/queue_disk_test.go')
| -rw-r--r-- | modules/queue/queue_disk_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/queue/queue_disk_test.go b/modules/queue/queue_disk_test.go index c7d3eb160b..789b6c3e64 100644 --- a/modules/queue/queue_disk_test.go +++ b/modules/queue/queue_disk_test.go @@ -7,11 +7,11 @@ package queue import ( "context" "io/ioutil" - "os" "sync" "testing" "time" + "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" ) @@ -31,7 +31,7 @@ func TestLevelQueue(t *testing.T) { tmpDir, err := ioutil.TempDir("", "level-queue-test-data") assert.NoError(t, err) - defer os.RemoveAll(tmpDir) + defer util.RemoveAll(tmpDir) queue, err := NewLevelQueue(handle, LevelQueueConfiguration{ ByteFIFOQueueConfiguration: ByteFIFOQueueConfiguration{ |