From 0d955079091a9b76b0358365b7ea7f068656cef0 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Mon, 23 Jan 2017 18:49:12 +0100
Subject: [PATCH] Fix test for PackerManager

---
 src/restic/repository/packer_manager.go      | 14 ++++++++++++++
 src/restic/repository/packer_manager_test.go | 13 +++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/restic/repository/packer_manager.go b/src/restic/repository/packer_manager.go
index e3f49f389..8e9327e3e 100644
--- a/src/restic/repository/packer_manager.go
+++ b/src/restic/repository/packer_manager.go
@@ -29,6 +29,20 @@ type Packer struct {
 	tmpfile *os.File
 }
 
+// Finalize finalizes the pack.Packer and then closes the tempfile.
+func (p *Packer) Finalize() (uint, error) {
+	n, err := p.Packer.Finalize()
+	if err != nil {
+		return n, err
+	}
+
+	if err = p.tmpfile.Close(); err != nil {
+		return n, err
+	}
+
+	return n, nil
+}
+
 // packerManager keeps a list of open packs and creates new on demand.
 type packerManager struct {
 	be      Saver
diff --git a/src/restic/repository/packer_manager_test.go b/src/restic/repository/packer_manager_test.go
index 59b502662..465fbadcb 100644
--- a/src/restic/repository/packer_manager_test.go
+++ b/src/restic/repository/packer_manager_test.go
@@ -53,17 +53,14 @@ func saveFile(t testing.TB, be Saver, filename string, id restic.ID) {
 		t.Fatal(err)
 	}
 
-	defer func() {
-		if err := f.Close(); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
 	h := restic.Handle{Type: restic.DataFile, Name: id.String()}
 	t.Logf("save file %v", h)
 
-	err = be.Save(h, f)
-	if err != nil {
+	if err = be.Save(h, f); err != nil {
+		t.Fatal(err)
+	}
+
+	if err = f.Close(); err != nil {
 		t.Fatal(err)
 	}