From b9c8e61d39fe2156b414c1d56e076d76dea11bc0 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Tue, 12 Jul 2016 19:40:41 +0100
Subject: [PATCH] Explicitly check the state in tests after writing files

...otherwise Amazon Drive will fail.
---
 fs/sync_test.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/fs/sync_test.go b/fs/sync_test.go
index c90ff513e..49f1eefd4 100644
--- a/fs/sync_test.go
+++ b/fs/sync_test.go
@@ -301,7 +301,10 @@ func TestSyncAfterChangingModtimeOnly(t *testing.T) {
 	r := NewRun(t)
 	defer r.Finalise()
 	file1 := r.WriteFile("empty space", "", t2)
-	r.WriteObject("empty space", "", t1)
+	file2 := r.WriteObject("empty space", "", t1)
+
+	fstest.CheckItems(t, r.flocal, file1)
+	fstest.CheckItems(t, r.fremote, file2)
 
 	fs.Stats.ResetCounters()
 	err := fs.Sync(r.fremote, r.flocal)
@@ -322,6 +325,9 @@ func TestSyncAfterChangingModtimeOnlyWithNoUpdateModTime(t *testing.T) {
 	file1 := r.WriteFile("empty space", "", t2)
 	file2 := r.WriteObject("empty space", "", t1)
 
+	fstest.CheckItems(t, r.flocal, file1)
+	fstest.CheckItems(t, r.fremote, file2)
+
 	fs.Stats.ResetCounters()
 	err := fs.Sync(r.fremote, r.flocal)
 	require.NoError(t, err)
@@ -336,6 +342,9 @@ func TestSyncAfterAddingAFile(t *testing.T) {
 	file1 := r.WriteBoth("empty space", "", t2)
 	file2 := r.WriteFile("potato", "------------------------------------------------------------", t3)
 
+	fstest.CheckItems(t, r.flocal, file1, file2)
+	fstest.CheckItems(t, r.fremote, file1)
+
 	fs.Stats.ResetCounters()
 	err := fs.Sync(r.fremote, r.flocal)
 	require.NoError(t, err)
@@ -478,6 +487,8 @@ func TestSyncWithExclude(t *testing.T) {
 	file1 := r.WriteBoth("potato2", "------------------------------------------------------------", t1)
 	file2 := r.WriteBoth("empty space", "", t2)
 	file3 := r.WriteFile("enormous", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", t1) // 100 bytes
+	fstest.CheckItems(t, r.fremote, file1, file2)
+	fstest.CheckItems(t, r.flocal, file1, file2, file3)
 
 	fs.Config.Filter.MaxSize = 40
 	defer func() {