From 1f5954e2c10318518d9f2e2aeb723cdbc8f6e86e Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sun, 28 May 2017 11:06:48 +0200
Subject: [PATCH] layout: Test DefaultLayout for empty path prefix

---
 src/restic/backend/layout_default.go |  2 +-
 src/restic/backend/layout_test.go    | 89 ++++++++++++++++++++++------
 2 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/src/restic/backend/layout_default.go b/src/restic/backend/layout_default.go
index 836700b33..665b85531 100644
--- a/src/restic/backend/layout_default.go
+++ b/src/restic/backend/layout_default.go
@@ -34,7 +34,7 @@ func (l *DefaultLayout) Dirname(h restic.Handle) string {
 func (l *DefaultLayout) Filename(h restic.Handle) string {
 	name := h.Name
 	if h.Type == restic.ConfigFile {
-		name = "config"
+		return l.Join(l.Path, "config")
 	}
 
 	return l.Join(l.Dirname(h), name)
diff --git a/src/restic/backend/layout_test.go b/src/restic/backend/layout_test.go
index cd06d4e63..48bc2a3db 100644
--- a/src/restic/backend/layout_test.go
+++ b/src/restic/backend/layout_test.go
@@ -12,53 +12,103 @@ import (
 )
 
 func TestDefaultLayout(t *testing.T) {
-	path, cleanup := TempDir(t)
+	tempdir, cleanup := TempDir(t)
 	defer cleanup()
 
 	var tests = []struct {
+		path string
+		join func(...string) string
 		restic.Handle
 		filename string
 	}{
 		{
+			tempdir,
+			filepath.Join,
 			restic.Handle{Type: restic.DataFile, Name: "0123456"},
-			filepath.Join(path, "data", "01", "0123456"),
+			filepath.Join(tempdir, "data", "01", "0123456"),
 		},
 		{
+			tempdir,
+			filepath.Join,
 			restic.Handle{Type: restic.ConfigFile, Name: "CFG"},
-			filepath.Join(path, "config"),
+			filepath.Join(tempdir, "config"),
 		},
 		{
+			tempdir,
+			filepath.Join,
 			restic.Handle{Type: restic.SnapshotFile, Name: "123456"},
-			filepath.Join(path, "snapshots", "123456"),
+			filepath.Join(tempdir, "snapshots", "123456"),
 		},
 		{
+			tempdir,
+			filepath.Join,
 			restic.Handle{Type: restic.IndexFile, Name: "123456"},
-			filepath.Join(path, "index", "123456"),
+			filepath.Join(tempdir, "index", "123456"),
 		},
 		{
+			tempdir,
+			filepath.Join,
 			restic.Handle{Type: restic.LockFile, Name: "123456"},
-			filepath.Join(path, "locks", "123456"),
+			filepath.Join(tempdir, "locks", "123456"),
 		},
 		{
+			tempdir,
+			filepath.Join,
 			restic.Handle{Type: restic.KeyFile, Name: "123456"},
-			filepath.Join(path, "keys", "123456"),
+			filepath.Join(tempdir, "keys", "123456"),
+		},
+		{
+			"",
+			path.Join,
+			restic.Handle{Type: restic.DataFile, Name: "0123456"},
+			"data/01/0123456",
+		},
+		{
+			"",
+			path.Join,
+			restic.Handle{Type: restic.ConfigFile, Name: "CFG"},
+			"config",
+		},
+		{
+			"",
+			path.Join,
+			restic.Handle{Type: restic.SnapshotFile, Name: "123456"},
+			"snapshots/123456",
+		},
+		{
+			"",
+			path.Join,
+			restic.Handle{Type: restic.IndexFile, Name: "123456"},
+			"index/123456",
+		},
+		{
+			"",
+			path.Join,
+			restic.Handle{Type: restic.LockFile, Name: "123456"},
+			"locks/123456",
+		},
+		{
+			"",
+			path.Join,
+			restic.Handle{Type: restic.KeyFile, Name: "123456"},
+			"keys/123456",
 		},
-	}
-
-	l := &DefaultLayout{
-		Path: path,
-		Join: filepath.Join,
 	}
 
 	t.Run("Paths", func(t *testing.T) {
+		l := &DefaultLayout{
+			Path: tempdir,
+			Join: filepath.Join,
+		}
+
 		dirs := l.Paths()
 
 		want := []string{
-			filepath.Join(path, "data"),
-			filepath.Join(path, "snapshots"),
-			filepath.Join(path, "index"),
-			filepath.Join(path, "locks"),
-			filepath.Join(path, "keys"),
+			filepath.Join(tempdir, "data"),
+			filepath.Join(tempdir, "snapshots"),
+			filepath.Join(tempdir, "index"),
+			filepath.Join(tempdir, "locks"),
+			filepath.Join(tempdir, "keys"),
 		}
 
 		sort.Sort(sort.StringSlice(want))
@@ -71,6 +121,11 @@ func TestDefaultLayout(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(fmt.Sprintf("%v/%v", test.Type, test.Handle.Name), func(t *testing.T) {
+			l := &DefaultLayout{
+				Path: test.path,
+				Join: test.join,
+			}
+
 			filename := l.Filename(test.Handle)
 			if filename != test.filename {
 				t.Fatalf("wrong filename, want %v, got %v", test.filename, filename)