From 9a8a2cae4c8bbbeaf0471b90008515063882b5fb Mon Sep 17 00:00:00 2001 From: greatroar <@> Date: Wed, 22 Jul 2020 23:53:55 +0200 Subject: [PATCH] Move pack testing logic to test file --- internal/pack/pack.go | 5 ----- internal/pack/pack_test.go | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/pack/pack.go b/internal/pack/pack.go index d4f064476..0e7995c61 100644 --- a/internal/pack/pack.go +++ b/internal/pack/pack.go @@ -151,11 +151,6 @@ func (p *Packer) Blobs() []restic.Blob { return p.blobs } -// Writer return the underlying writer. -func (p *Packer) Writer() io.Writer { - return p.wr -} - func (p *Packer) String() string { return fmt.Sprintf("", len(p.blobs), p.bytes) } diff --git a/internal/pack/pack_test.go b/internal/pack/pack_test.go index e40e5bd2a..99755c36f 100644 --- a/internal/pack/pack_test.go +++ b/internal/pack/pack_test.go @@ -36,7 +36,8 @@ func newPack(t testing.TB, k *crypto.Key, lengths []int) ([]Buf, []byte, uint) { } // pack blobs - p := pack.NewPacker(k, new(bytes.Buffer)) + var buf bytes.Buffer + p := pack.NewPacker(k, &buf) for _, b := range bufs { p.Add(restic.TreeBlob, b.id, b.data) } @@ -44,8 +45,7 @@ func newPack(t testing.TB, k *crypto.Key, lengths []int) ([]Buf, []byte, uint) { _, err := p.Finalize() rtest.OK(t, err) - packData := p.Writer().(*bytes.Buffer).Bytes() - return bufs, packData, p.Size() + return bufs, buf.Bytes(), p.Size() } func verifyBlobs(t testing.TB, bufs []Buf, k *crypto.Key, rd io.ReaderAt, packSize uint) {