extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-08-09 21:57:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

vfs: writeback: add Rename call for renaming items in the writeback queue

Browse Source
This commit is contained in:
Nick Craig-Wood
2020-07-03 17:16:28 +01:00
parent 80fe1f16db
commit df5dbaf49b
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
vfs/vfscache/writeback/writeback_test.go
View File

@ -540,12 +540,12 @@ func TestWriteBackMaxQueue(t *testing.T) {
assert.Equal(t, inProgress, 0)
}
func TestWriteBackRemove(t *testing.T) {
func TestWriteBackRename(t *testing.T) {
wb, cancel := newTestWriteBack(t)
defer cancel()
// cancel when not in writeback
assert.False(t, wb.Remove(1))
wb.Rename(1, "nonExistent")
// add item
pi1 := newPutItem(t)
@ -553,28 +553,34 @@ func TestWriteBackRemove(t *testing.T) {
wbItem := wb.lookup[id]
checkOnHeap(t, wb, wbItem)
checkInLookup(t, wb, wbItem)
assert.Equal(t, wbItem.name, "one")
// cancel when not uploading
assert.True(t, wb.Remove(id))
checkNotOnHeap(t, wb, wbItem)
checkNotInLookup(t, wb, wbItem)
// rename when not uploading
wb.Rename(id, "two")
checkOnHeap(t, wb, wbItem)
checkInLookup(t, wb, wbItem)
assert.False(t, pi1.cancelled)
assert.Equal(t, wbItem.name, "two")
// add item
pi2 := newPutItem(t)
id = wb.Add(id, "one", true, pi2.put)
id = wb.Add(id, "two", true, pi2.put)
wbItem = wb.lookup[id]
checkOnHeap(t, wb, wbItem)
checkInLookup(t, wb, wbItem)
assert.Equal(t, wbItem.name, "two")
// wait for upload to start
<-pi2.started
// cancel when uploading
assert.True(t, wb.Remove(id))
checkNotOnHeap(t, wb, wbItem)
checkNotInLookup(t, wb, wbItem)
checkInLookup(t, wb, wbItem)
// rename when uploading - goes back on heap
wb.Rename(id, "three")
checkOnHeap(t, wb, wbItem)
checkInLookup(t, wb, wbItem)
assert.True(t, pi2.cancelled)
assert.Equal(t, wbItem.name, "three")
}
func TestWriteBackCancelUpload(t *testing.T) {