Merge pull request #1268 from sdboyer/ignore-trie

Introduce IgnoredRuleset

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"