dep: Add more harness tests for wildcard ignores

This also adds `dep hash-inputs` output to both of the harness tests, so
that it's easier for developers to keep track of the expected output in
these cases.

Author: sdboyer

cmd/dep/integration_test.go

@@ -123,8 +123,12 @@ func testIntegration(name, relPath, wd string, run integration.RunFunc) func(t *
 		// Check error raised in final command
 		testCase.CompareError(err, testProj.GetStderr())
 
-		// Check output
-		testCase.CompareOutput(testProj.GetStdout())
+		if *test.UpdateGolden {
+			testCase.UpdateOutput(testProj.GetStdout())
+		} else {
+			// Check output
+			testCase.CompareOutput(testProj.GetStdout())
+		}
 
 		// Check vendor paths
 		testProj.CompareImportPaths()

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/final/Gopkg.lock

@@ -0,0 +1,11 @@
+-CONSTRAINTS-
+github.com/sdboyer/deptest
+b-master
+-IMPORTS/REQS-
+github.com/sdboyer/deptest
+-IGNORES-
+-OVERRIDES-
+-ANALYZER-
+dep
+1
+

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/stdout.txt

@@ -1,6 +1,7 @@
 {
   "commands": [
-    ["ensure"]
+    ["ensure"],
+    ["hash-inputs"]
   ],
   "error-expected": "",
   "vendor-final": [

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/testcase.json

@@ -0,0 +1 @@
+ignored = ["github.com/sdboyer/deptest*", "github.com/golang/notexist/samples*"]

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/final/Gopkg.lock

@@ -0,0 +1 @@
+ignored = ["github.com/sdboyer/deptest*", "github.com/golang/notexist/samples*"]

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/final/Gopkg.toml

@@ -0,0 +1,12 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	_ "github.com/sdboyer/deptest"
+)
+
+func main() {
+}

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/Gopkg.lock

@@ -0,0 +1,7 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package samples
+
+import _ "github.com/sdboyer/deptestdos"

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/Gopkg.toml

@@ -0,0 +1,7 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package subsamples
+
+import _ "github.com/sdboyer/dep-test"

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/main.go

@@ -0,0 +1,9 @@
+-CONSTRAINTS-
+-IMPORTS/REQS-
+-IGNORES-
+github.com/sdboyer/deptest*
+-OVERRIDES-
+-ANALYZER-
+dep
+1
+

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/samples/samples.go

@@ -0,0 +1,8 @@
+{
+  "commands": [
+    ["ensure"],
+    ["hash-inputs"]
+  ],
+  "error-expected": "",
+  "vendor-final": []
+}

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/samples/subsamples/subsamples.go

@@ -83,21 +83,38 @@ func (tc *TestCase) CompareFile(goldenPath, working string) {
 
 	gotExists, got, err := getFile(working)
 	if err != nil {
-		tc.t.Fatalf("Error reading project file %s: %s", goldenPath, err)
+		tc.t.Fatalf("Error reading project file %q: %s", goldenPath, err)
 	}
 	wantExists, want, err := getFile(golden)
 	if err != nil {
-		tc.t.Fatalf("Error reading testcase file %s: %s", goldenPath, err)
+		tc.t.Fatalf("Error reading testcase file %q: %s", goldenPath, err)
 	}
 
 	if wantExists && gotExists {
 		if want != got {
-			tc.t.Errorf("expected %s, got %s", want, got)
+			tc.t.Errorf("%s was not as expected\n(WNT):\n%s\n(GOT):\n%s", filepath.Base(goldenPath), want, got)
 		}
 	} else if !wantExists && gotExists {
-		tc.t.Errorf("%s created where none was expected", goldenPath)
+		tc.t.Errorf("%q created where none was expected", goldenPath)
 	} else if wantExists && !gotExists {
-		tc.t.Errorf("%s not created where one was expected", goldenPath)
+		tc.t.Errorf("%q not created where one was expected", goldenPath)
+	}
+}
+
+// UpdateFile updates the golden file with the working result.
+func (tc *TestCase) UpdateOutput(stdout string) {
+	stdoutPath := filepath.Join(tc.rootPath, "stdout.txt")
+	_, err := os.Stat(stdoutPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			// Don't update the stdout.txt file if it doesn't exist.
+			return
+		}
+		panic(err)
+	}
+
+	if err := tc.WriteFile(stdoutPath, stdout); err != nil {
+		tc.t.Fatal(err)
 	}
 }
 
@@ -116,7 +133,7 @@ func (tc *TestCase) CompareOutput(stdout string) {
 	stdout = normalizeLines(stdout)
 
 	if expStr != stdout {
-		tc.t.Errorf("(WNT):\n%s\n(GOT):\n%s\n", expStr, stdout)
+		tc.t.Errorf("stdout was not as expected\n(WNT):\n%s\n(GOT):\n%s\n", expStr, stdout)
 	}
 }