Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

operations: fix TestDeleteFatalError, TestDirMoveMoveError and TestDirMoveContext on remotes

Nick Craig-Woodff958c999fdc
diff --git a/fs/operations/operations_test.go b/fs/operations/operations_test.go
index eb9184616..23a48e7d2 100644
--- a/fs/operations/operations_test.go
+++ b/fs/operations/operations_test.go
@@ -433,12 +433,13 @@ func TestDeleteFatalError(t *testing.T) {
ctx := context.Background()
ctx, ci := fs.AddConfig(ctx)
ci.Checkers = 2
- ci.MaxDelete = 1
r := fstest.NewRun(t)
// More files than the deleters' channel can hold
for i := range 20 {
r.WriteObject(ctx, fmt.Sprintf("file%d", i), "x", t1)
}
+ // Set after writing the files as some backends (eg chunker) delete while uploading
+ ci.MaxDelete = 1
done := make(chan error, 1)
go func() {
@@ -1483,6 +1484,11 @@ type noDirMoveFs struct {
func (f *noDirMoveFs) Features() *fs.Features { return f.features }
func newNoDirMoveFs(t *testing.T, wrapped fs.Fs, failOn string) *noDirMoveFs {
+ // This tests the core DirMove logic, and on other backends the
+ // objects may not belong to wrapped or there may be no Move.
+ if *fstest.RemoteName != "" {
+ t.Skip("Skipping test on non local remote")
+ }
move := wrapped.Features().Move
require.NotNil(t, move, "the test needs a backend with Move")
f := &noDirMoveFs{