Add sftp tests

backend/sftp/backend_test.go

@@ -0,0 +1,87 @@
+// DO NOT EDIT, AUTOMATICALLY GENERATED
+package sftp_test
+
+import (
+	"testing"
+
+	"github.com/restic/restic/backend/test"
+)
+
+var SkipMessage string
+
+func TestSftpBackendCreate(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Create(t)
+}
+
+func TestSftpBackendOpen(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Open(t)
+}
+
+func TestSftpBackendCreateWithConfig(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.CreateWithConfig(t)
+}
+
+func TestSftpBackendLocation(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Location(t)
+}
+
+func TestSftpBackendConfig(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Config(t)
+}
+
+func TestSftpBackendGetReader(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.GetReader(t)
+}
+
+func TestSftpBackendLoad(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Load(t)
+}
+
+func TestSftpBackendWrite(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Write(t)
+}
+
+func TestSftpBackendGeneric(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Generic(t)
+}
+
+func TestSftpBackendDelete(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Delete(t)
+}
+
+func TestSftpBackendCleanup(t *testing.T) {
+	if SkipMessage != "" {
+		t.Skip(SkipMessage)
+	}
+	test.Cleanup(t)
+}

backend/sftp/sftp.go

@@ -369,6 +369,10 @@ func (r *SFTP) GetReader(t backend.Type, name string, offset, length uint) (io.R
 // Load returns the data stored in the backend for h at the given offset
 // and saves it in p. Load has the same semantics as io.ReaderAt.
 func (r *SFTP) Load(h backend.Handle, p []byte, off int64) (n int, err error) {
+	if err := h.Valid(); err != nil {
+		return 0, err
+	}
+
 	f, err := r.c.Open(r.filename(h.Type, h.Name))
 	if err != nil {
 		return 0, err

backend/sftp/sftp_backend_test.go

@@ -0,0 +1,81 @@
+package sftp_test
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/restic/restic/backend"
+	"github.com/restic/restic/backend/sftp"
+	"github.com/restic/restic/backend/test"
+
+	. "github.com/restic/restic/test"
+)
+
+var tempBackendDir string
+
+//go:generate go run ../test/generate_backend_tests.go
+
+func createTempdir() error {
+	if tempBackendDir != "" {
+		return nil
+	}
+
+	tempdir, err := ioutil.TempDir("", "restic-local-test-")
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("created new test backend at %v\n", tempdir)
+	tempBackendDir = tempdir
+	return nil
+}
+
+func init() {
+	sftpserver := ""
+
+	for _, dir := range strings.Split(TestSFTPPath, ":") {
+		testpath := filepath.Join(dir, "sftp-server")
+		fd, err := os.Open(testpath)
+		fd.Close()
+		if !os.IsNotExist(err) {
+			sftpserver = testpath
+			break
+		}
+	}
+
+	if sftpserver == "" {
+		SkipMessage = "sftp server binary not found, skipping tests"
+		return
+	}
+
+	test.CreateFn = func() (backend.Backend, error) {
+		err := createTempdir()
+		if err != nil {
+			return nil, err
+		}
+
+		return sftp.Create(tempBackendDir, sftpserver)
+	}
+
+	test.OpenFn = func() (backend.Backend, error) {
+		err := createTempdir()
+		if err != nil {
+			return nil, err
+		}
+		return sftp.Open(tempBackendDir, sftpserver)
+	}
+
+	test.CleanupFn = func() error {
+		if tempBackendDir == "" {
+			return nil
+		}
+
+		fmt.Printf("removing test backend at %v\n", tempBackendDir)
+		err := os.RemoveAll(tempBackendDir)
+		tempBackendDir = ""
+		return err
+	}
+}