dep: Minor test and lint nits

sdboyer · sdboyer · commit 50326d738274 · 2017-10-13T14:48:40.000-04:00
diff --git a/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.toml b/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.toml
@@ -1,4 +1,4 @@
-ignored = ["github.com/sdboyer/dep-test","github.com/golang/notexist/samples"]
+ignored = ["github.com/golang/notexist/samples","github.com/sdboyer/dep-test"]
 
 [[constraint]]
   name = "github.com/carolynvs/deptest-subpkg"
diff --git a/internal/test/integration/testcase.go b/internal/test/integration/testcase.go
@@ -101,7 +101,7 @@ func (tc *TestCase) CompareFile(goldenPath, working string) {
 	}
 }
 
-// UpdateFile updates the golden file with the working result.
+// UpdateOutput updates the golden file for stdout with the working result.
 func (tc *TestCase) UpdateOutput(stdout string) {
 	stdoutPath := filepath.Join(tc.rootPath, "stdout.txt")
 	_, err := os.Stat(stdoutPath)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ignored = ["github.com/sdboyer/dep-test","github.com/golang/notexist/samples"]`
	`1`	`+ignored = ["github.com/golang/notexist/samples","github.com/sdboyer/dep-test"]`
`2`	`2`
`3`	`3`	`[[constraint]]`
`4`	`4`	`name = "github.com/carolynvs/deptest-subpkg"`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (tc *TestCase) CompareFile(goldenPath, working string) {`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`-// UpdateFile updates the golden file with the working result.`
	`104`	`+// UpdateOutput updates the golden file for stdout with the working result.`
`105`	`105`	`func (tc *TestCase) UpdateOutput(stdout string) {`
`106`	`106`	`stdoutPath := filepath.Join(tc.rootPath, "stdout.txt")`
`107`	`107`	`_, err := os.Stat(stdoutPath)`