Fix formatting for gofmt with Go 1.11

.travis.yml

@@ -4,17 +4,12 @@ sudo: false
 matrix:
   include:
     - os: linux
-      go: "1.9.x"
+      go: "1.10.x"
       env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0 RESTIC_BUILD_SOLARIS=0
 
-    # only run fuse and cloud backends tests on Travis for the latest Go on Linux
     - os: linux
-      go: "1.10.x"
+      go: "1.11beta2"
-      sudo: true
+      env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0 RESTIC_BUILD_SOLARIS=0
-
-    - os: osx
-      go: "1.10.x"
-      env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0
 
 branches:
   only:

internal/archiver/testing_test.go

@@ -194,12 +194,12 @@ func TestTestWalkFiles(t *testing.T) {
 				},
 			},
 			want: map[string]string{
-				"foo":    "<File>",
+				"foo":                                "<File>",
-				"subdir": "<Dir>",
+				"subdir":                             "<Dir>",
 				filepath.FromSlash("subdir/subfile"): "<File>",
-				"x": "<Dir>",
+				"x":                                  "<Dir>",
-				filepath.FromSlash("x/y"):      "<Dir>",
+				filepath.FromSlash("x/y"):            "<Dir>",
-				filepath.FromSlash("x/y/link"): "<Symlink>",
+				filepath.FromSlash("x/y/link"):       "<Symlink>",
 			},
 		},
 	}
@@ -373,7 +373,7 @@ func TestTestEnsureSnapshot(t *testing.T) {
 	}{
 		{
 			files: map[string]interface{}{
-				"foo": TestFile{Content: "foo"},
+				"foo":                                TestFile{Content: "foo"},
 				filepath.FromSlash("subdir/subfile"): TestFile{Content: "bar"},
 				filepath.FromSlash("x/y/link"):       TestSymlink{Target: filepath.FromSlash("../../foo")},
 			},

run_integration_tests.go

@@ -246,7 +246,7 @@ func (env *TravisEnvironment) RunTests() error {
 	}
 
 	// run the build script
-	if err := run("go", "run", "build.go"); err != nil {
+	if err := run("go", "run", "build.go", "-v", "-T"); err != nil {
 		return err
 	}