From 5898cb341f4099d0d427f2f03e61ca6c95bd23c7 Mon Sep 17 00:00:00 2001 From: Alexander Weiss Date: Sat, 10 Oct 2020 22:29:55 +0200 Subject: [PATCH] Use CreateIndexFromPacks() in test --- internal/repository/repack_test.go | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/internal/repository/repack_test.go b/internal/repository/repack_test.go index 87470d815..0def34f09 100644 --- a/internal/repository/repack_test.go +++ b/internal/repository/repack_test.go @@ -6,7 +6,6 @@ import ( "testing" "time" - "github.com/restic/restic/internal/index" "github.com/restic/restic/internal/repository" "github.com/restic/restic/internal/restic" ) @@ -163,7 +162,21 @@ func saveIndex(t *testing.T, repo restic.Repository) { } func rebuildIndex(t *testing.T, repo restic.Repository) { - idx, _, err := index.New(context.TODO(), repo, restic.NewIDSet(), nil) + err := repo.SetIndex(repository.NewMasterIndex()) + if err != nil { + t.Fatal(err) + } + + packs := make(map[restic.ID]int64) + err = repo.List(context.TODO(), restic.PackFile, func(id restic.ID, size int64) error { + packs[id] = size + return nil + }) + if err != nil { + t.Fatal(err) + } + + _, err = repo.(*repository.Repository).CreateIndexFromPacks(context.TODO(), packs, nil) if err != nil { t.Fatal(err) } @@ -179,7 +192,9 @@ func rebuildIndex(t *testing.T, repo restic.Repository) { t.Fatal(err) } - _, err = idx.Save(context.TODO(), repo, nil) + _, err = (repo.Index()).(*repository.MasterIndex). + Save(context.TODO(), repo, restic.NewIDSet(), nil) + if err != nil { t.Fatal(err) }