Add options for Open and implement Range for all remotes

fstest/fstests/fstests.go

@@ -10,6 +10,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"path"
 	"sort"
@@ -37,14 +38,16 @@ var (
 		ModTime: fstest.Time("2001-02-03T04:05:06.499999999Z"),
 		Path:    "file name.txt",
 	}
-	file2 = fstest.Item{
+	file1Contents = ""
+	file2         = fstest.Item{
 		ModTime: fstest.Time("2001-02-03T04:05:10.123123123Z"),
 		Path:    `hello? sausage/êé/Hello, 世界/ " ' @ < > & ? + ≠/z.txt`,
 		WinPath: `hello_ sausage/êé/Hello, 世界/ _ ' @ _ _ & _ + ≠/z.txt`,
 	}
-	verbose     = flag.Bool("verbose", false, "Set to enable logging")
-	dumpHeaders = flag.Bool("dump-headers", false, "Dump HTTP headers - may contain sensitive info")
-	dumpBodies  = flag.Bool("dump-bodies", false, "Dump HTTP headers and bodies - may contain sensitive info")
+	file2Contents = ""
+	verbose       = flag.Bool("verbose", false, "Set to enable logging")
+	dumpHeaders   = flag.Bool("dump-headers", false, "Dump HTTP headers - may contain sensitive info")
+	dumpBodies    = flag.Bool("dump-bodies", false, "Dump HTTP headers and bodies - may contain sensitive info")
 )
 
 // ExtraConfigItem describes a config item added on the fly while testing
@@ -195,9 +198,10 @@ func findObject(t *testing.T, Name string) fs.Object {
 	return obj
 }
 
-func testPut(t *testing.T, file *fstest.Item) {
+func testPut(t *testing.T, file *fstest.Item) string {
 again:
-	buf := bytes.NewBufferString(fstest.RandomString(100))
+	contents := fstest.RandomString(100)
+	buf := bytes.NewBufferString(contents)
 	hash := fs.NewMultiHasher()
 	in := io.TeeReader(buf, hash)
 
@@ -222,24 +226,25 @@ again:
 	// Re-read the object and check again
 	obj = findObject(t, file.Path)
 	file.Check(t, obj, remote.Precision())
+	return contents
 }
 
 // TestFsPutFile1 tests putting a file
 func TestFsPutFile1(t *testing.T) {
 	skipIfNotOk(t)
-	testPut(t, &file1)
+	file1Contents = testPut(t, &file1)
 }
 
 // TestFsPutFile2 tests putting a file into a subdirectory
 func TestFsPutFile2(t *testing.T) {
 	skipIfNotOk(t)
-	testPut(t, &file2)
+	file2Contents = testPut(t, &file2)
 }
 
 // TestFsUpdateFile1 tests updating file1 with new contents
 func TestFsUpdateFile1(t *testing.T) {
 	skipIfNotOk(t)
-	testPut(t, &file1)
+	file1Contents = testPut(t, &file1)
 	// Note that the next test will check there are no duplicated file names
 }
 
@@ -541,42 +546,56 @@ func TestObjectSize(t *testing.T) {
 	assert.Equal(t, file1.Size, obj.Size())
 }
 
+// read the contents of an object as a string
+func readObject(t *testing.T, obj fs.Object, options ...fs.OpenOption) string {
+	in, err := obj.Open(options...)
+	require.NoError(t, err)
+	contents, err := ioutil.ReadAll(in)
+	require.NoError(t, err)
+	err = in.Close()
+	require.NoError(t, err)
+	return string(contents)
+}
+
 // TestObjectOpen tests that Open works
 func TestObjectOpen(t *testing.T) {
 	skipIfNotOk(t)
 	obj := findObject(t, file1.Path)
-	in, err := obj.Open()
-	require.NoError(t, err)
-	hasher := fs.NewMultiHasher()
-	n, err := io.Copy(hasher, in)
-	require.NoError(t, err, fmt.Sprintf("hasher copy error: %v", err))
-	require.Equal(t, file1.Size, n, "Read wrong number of bytes")
-	err = in.Close()
-	require.NoError(t, err)
-	// Check content of file by comparing the calculated hashes
-	for hashType, got := range hasher.Sums() {
-		assert.Equal(t, file1.Hashes[hashType], got)
-	}
+	assert.Equal(t, file1Contents, readObject(t, obj), "contents of file1 differ")
+}
 
+// TestObjectOpenSeek tests that Open works with Seek
+func TestObjectOpenSeek(t *testing.T) {
+	skipIfNotOk(t)
+	obj := findObject(t, file1.Path)
+	assert.Equal(t, file1Contents[50:], readObject(t, obj, &fs.SeekOption{Offset: 50}), "contents of file1 differ after seek")
 }
 
 // TestObjectUpdate tests that Update works
 func TestObjectUpdate(t *testing.T) {
 	skipIfNotOk(t)
-	buf := bytes.NewBufferString(fstest.RandomString(200))
+	contents := fstest.RandomString(200)
+	buf := bytes.NewBufferString(contents)
 	hash := fs.NewMultiHasher()
 	in := io.TeeReader(buf, hash)
 
 	file1.Size = int64(buf.Len())
 	obj := findObject(t, file1.Path)
-	obji := fs.NewStaticObjectInfo(file1.Path, file1.ModTime, file1.Size, true, nil, obj.Fs())
+	obji := fs.NewStaticObjectInfo(file1.Path, file1.ModTime, int64(len(contents)), true, nil, obj.Fs())
 	err := obj.Update(in, obji)
 	require.NoError(t, err)
 	file1.Hashes = hash.Sums()
+
+	// check the object has been updated
 	file1.Check(t, obj, remote.Precision())
+
 	// Re-read the object and check again
 	obj = findObject(t, file1.Path)
 	file1.Check(t, obj, remote.Precision())
+
+	// check contents correct
+	assert.Equal(t, contents, readObject(t, obj), "contents of updated file1 differ")
+	file1Contents = contents
 }
 
 // TestObjectStorable tests that Storable works