From 0e23c4542f05382750bc53c7fdfe348093e14453 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Sun, 12 May 2019 09:50:20 +0100 Subject: [PATCH] sync: fix integrations tests 2eb31a4f1d1da08d broke the integration tests for remotes which use Copy+Delete as server side Move. --- fs/sync/sync_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/sync/sync_test.go b/fs/sync/sync_test.go index e77719dff..3ec14dc07 100644 --- a/fs/sync/sync_test.go +++ b/fs/sync/sync_test.go @@ -995,9 +995,17 @@ func TestSyncWithTrackRenames(t *testing.T) { fstest.CheckItems(t, r.Fremote, f1, f2) if canTrackRenames { - assert.Equal(t, int64(0), accounting.Stats.GetTransfers()) + if r.Fremote.Features().Move == nil { + // If no server side Move, we are falling back to Copy + Delete + assert.Equal(t, int64(1), accounting.Stats.GetTransfers()) // 1 copy + assert.Equal(t, int64(4), accounting.Stats.GetChecks()) // 2 file checks + 1 move + 1 delete + } else { + assert.Equal(t, int64(0), accounting.Stats.GetTransfers()) // 0 copy + assert.Equal(t, int64(3), accounting.Stats.GetChecks()) // 2 file checks + 1 move + } } else { - assert.Equal(t, int64(1), accounting.Stats.GetTransfers()) + assert.Equal(t, int64(2), accounting.Stats.GetChecks()) // 2 file checks + assert.Equal(t, int64(1), accounting.Stats.GetTransfers()) // 0 copy } }