forked from forgejo/forgejo
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>
This commit is contained in:
parent
faa676cc8b
commit
74bd9691c6
60 changed files with 304 additions and 202 deletions
|
@ -6,7 +6,6 @@ package issues
|
|||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
@ -14,6 +13,7 @@ import (
|
|||
|
||||
"code.gitea.io/gitea/models"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
"code.gitea.io/gitea/modules/util"
|
||||
|
||||
"gopkg.in/ini.v1"
|
||||
|
||||
|
@ -40,7 +40,7 @@ func TestBleveSearchIssues(t *testing.T) {
|
|||
defer func() {
|
||||
setting.Indexer.IssueQueueDir = oldQueueDir
|
||||
setting.Indexer.IssuePath = oldIssuePath
|
||||
os.RemoveAll(tmpIndexerDir)
|
||||
util.RemoveAll(tmpIndexerDir)
|
||||
}()
|
||||
|
||||
setting.Indexer.IssueType = "bleve"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue