jgaunt/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-16 00:04:40 +00:00
Code Issues Projects Releases Wiki Activity

move: add --delete-empty-src-dirs flag - fixes #1854

Browse Source
This commit is contained in:
ishuah
2017-11-27 14:42:02 +03:00
committed by Ishuah Kariuki
parent 1248beb0b2
commit aab8051f50
5 changed files with 84 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
fs/sync_test.go
View File

@@ -798,7 +798,7 @@ func TestSyncWithTrackRenames(t *testing.T) {
}
// Test a server side move if possible, or the backup path if not
func testServerSideMove(t *testing.T, r *fstest.Run, withFilter bool) {
func testServerSideMove(t *testing.T, r *fstest.Run, withFilter, testDeleteEmptyDirs bool) {
FremoteMove, _, finaliseMove, err := fstest.RandomRemote(*fstest.RemoteName, *fstest.SubDir)
require.NoError(t, err)
defer finaliseMove()
@@ -807,6 +807,11 @@ func testServerSideMove(t *testing.T, r *fstest.Run, withFilter bool) {
file2 := r.WriteBoth("empty space", "", t2)
file3u := r.WriteBoth("potato3", "------------------------------------------------------------ UPDATED", t2)
if testDeleteEmptyDirs {
err := fs.Mkdir(r.Fremote, "tomatoDir")
require.NoError(t, err)
}
fstest.CheckItems(t, r.Fremote, file2, file1, file3u)
t.Logf("Server side move (if possible) %v -> %v", r.Fremote, FremoteMove)
@@ -818,7 +823,7 @@ func testServerSideMove(t *testing.T, r *fstest.Run, withFilter bool) {
// Do server side move
fs.Stats.ResetCounters()
err = fs.MoveDir(FremoteMove, r.Fremote)
err = fs.MoveDir(FremoteMove, r.Fremote, testDeleteEmptyDirs)
require.NoError(t, err)
if withFilter {
@@ -826,6 +831,11 @@ func testServerSideMove(t *testing.T, r *fstest.Run, withFilter bool) {
} else {
fstest.CheckItems(t, r.Fremote)
}
if testDeleteEmptyDirs {
fstest.CheckListingWithPrecision(t, r.Fremote, nil, []string{}, fs.Config.ModifyWindow)
}
fstest.CheckItems(t, FremoteMove, file2, file1, file3u)
// Create a new empty remote for stuff to be moved into
@@ -833,9 +843,14 @@ func testServerSideMove(t *testing.T, r *fstest.Run, withFilter bool) {
require.NoError(t, err)
defer finaliseMove2()
if testDeleteEmptyDirs {
err := fs.Mkdir(FremoteMove, "tomatoDir")
require.NoError(t, err)
}
// Move it back to a new empty remote, dst does not exist this time
fs.Stats.ResetCounters()
err = fs.MoveDir(FremoteMove2, FremoteMove)
err = fs.MoveDir(FremoteMove2, FremoteMove, testDeleteEmptyDirs)
require.NoError(t, err)
if withFilter {
@@ -845,13 +860,17 @@ func testServerSideMove(t *testing.T, r *fstest.Run, withFilter bool) {
fstest.CheckItems(t, FremoteMove2, file2, file1, file3u)
fstest.CheckItems(t, FremoteMove)
}
if testDeleteEmptyDirs {
fstest.CheckListingWithPrecision(t, FremoteMove, nil, []string{}, fs.Config.ModifyWindow)
}
}
// Test a server side move if possible, or the backup path if not
func TestServerSideMove(t *testing.T) {
r := fstest.NewRun(t)
defer r.Finalise()
testServerSideMove(t, r, false)
testServerSideMove(t, r, false, false)
}
// Test a server side move if possible, or the backup path if not
@@ -864,7 +883,14 @@ func TestServerSideMoveWithFilter(t *testing.T) {
fs.Config.Filter.MinSize = -1
}()
testServerSideMove(t, r, true)
testServerSideMove(t, r, true, false)
}
// Test a server side move if possible
func TestServerSideMoveDeleteEmptySourceDirs(t *testing.T) {
r := fstest.NewRun(t)
defer r.Finalise()
testServerSideMove(t, r, false, true)
}
// Test a server side move with overlap
@@ -884,7 +910,7 @@ func TestServerSideMoveOverlap(t *testing.T) {
fstest.CheckItems(t, r.Fremote, file1)
// Subdir move with no filters should return ErrorCantMoveOverlapping
err = fs.MoveDir(FremoteMove, r.Fremote)
err = fs.MoveDir(FremoteMove, r.Fremote, false)
assert.EqualError(t, err, fs.ErrorCantMoveOverlapping.Error())
// Now try with a filter which should also fail with ErrorCantMoveOverlapping
@@ -892,7 +918,7 @@ func TestServerSideMoveOverlap(t *testing.T) {
defer func() {
fs.Config.Filter.MinSize = -1
}()
err = fs.MoveDir(FremoteMove, r.Fremote)
err = fs.MoveDir(FremoteMove, r.Fremote, false)
assert.EqualError(t, err, fs.ErrorCantMoveOverlapping.Error())
}