TrueCloudLab/rclone
16
0
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fstest: Use walk.ListR for listing

Browse source
This commit is contained in:
Nick Craig-Wood 2019-01-21 17:02:48 +00:00
parent 47099466c0
commit 7267d19ad8
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fstest/fstest.go
View file

@ -468,11 +468,8 @@ func Purge(f fs.Fs) {
} }
if doFallbackPurge { if doFallbackPurge {
dirs := []string{""} dirs := []string{""}
err = walk.Walk(f, "", true, -1, func(dirPath string, entries fs.DirEntries, err error) error { err = walk.ListR(f, "", true, -1, walk.ListAll, func(entries fs.DirEntries) error {
if err != nil { var err error
log.Printf("purge walk returned error: %v", err)
return nil
}
entries.ForObject(func(obj fs.Object) { entries.ForObject(func(obj fs.Object) {
fs.Debugf(f, "Purge object %q", obj.Remote()) fs.Debugf(f, "Purge object %q", obj.Remote())
err = obj.Remove() err = obj.Remove()

8
fstest/run.go
View file

@ -139,13 +139,7 @@ func newRunIndividual(t *testing.T, individual bool) *Run {
*r = *oneRun *r = *oneRun
r.cleanRemote = func() { r.cleanRemote = func() {
var toDelete []string var toDelete []string
err := walk.Walk(r.Fremote, "", true, -1, func(dirPath string, entries fs.DirEntries, err error) error { err := walk.ListR(r.Fremote, "", true, -1, walk.ListAll, func(entries fs.DirEntries) error {
if err != nil {
if err == fs.ErrorDirNotFound {
return nil
}
t.Fatalf("Error listing: %v", err)
}
for _, entry := range entries { for _, entry := range entries {
switch x := entry.(type) { switch x := entry.(type) {
case fs.Object: case fs.Object: