Use new archiver code in tests

internal/archiver/testing.go

@@ -19,8 +19,16 @@ import (
 
 // TestSnapshot creates a new snapshot of path.
 func TestSnapshot(t testing.TB, repo restic.Repository, path string, parent *restic.ID) *restic.Snapshot {
-	arch := New(repo)
-	sn, _, err := arch.Snapshot(context.TODO(), nil, []string{path}, []string{"test"}, "localhost", parent, time.Now())
+	arch := New(repo, fs.Local{}, Options{})
+	opts := SnapshotOptions{
+		Time:     time.Now(),
+		Hostname: "localhost",
+		Tags:     []string{"test"},
+	}
+	if parent != nil {
+		opts.ParentSnapshot = *parent
+	}
+	sn, _, err := arch.Snapshot(context.TODO(), []string{path}, opts)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/archiver/testing_test.go

@@ -496,14 +496,19 @@ func TestTestEnsureSnapshot(t *testing.T) {
 
 			createFilesAt(t, targetDir, test.files)
 
-			back := fs.TestChdir(t, targetDir)
+			back := fs.TestChdir(t, tempdir)
 			defer back()
 
 			repo, cleanup := repository.TestRepository(t)
 			defer cleanup()
 
-			arch := New(repo)
-			_, id, err := arch.Snapshot(ctx, nil, []string{"."}, nil, "hostname", nil, time.Now())
+			arch := New(repo, fs.Local{}, Options{})
+			opts := SnapshotOptions{
+				Time:     time.Now(),
+				Hostname: "localhost",
+				Tags:     []string{"test"},
+			}
+			_, id, err := arch.Snapshot(ctx, []string{"."}, opts)
 			if err != nil {
 				t.Fatal(err)
 			}

internal/checker/checker_test.go

@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"sort"
 	"testing"
-	"time"
 
 	"github.com/restic/restic/internal/archiver"
 	"github.com/restic/restic/internal/checker"
@@ -326,10 +325,8 @@ func TestCheckerModifiedData(t *testing.T) {
 	repo, cleanup := repository.TestRepository(t)
 	defer cleanup()
 
-	arch := archiver.New(repo)
-	_, id, err := arch.Snapshot(context.TODO(), nil, []string{"."}, nil, "localhost", nil, time.Now())
-	test.OK(t, err)
-	t.Logf("archived as %v", id.Str())
+	sn := archiver.TestSnapshot(t, repo, ".", nil)
+	t.Logf("archived as %v", sn.ID().Str())
 
 	beError := &errorBackend{Backend: repo.Backend()}
 	checkRepo := repository.New(beError)