Don't expect ignored directories to actually be ignored

golang · Jul 29, 2017 · 5e6d42e · 5e6d42e
1 parent 1772eda
commit 5e6d42e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/cmd/dep/testdata/harness_tests/init/govendor/case1/final/Gopkg.lock b/cmd/dep/testdata/harness_tests/init/govendor/case1/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/init/govendor/case1/final/Gopkg.toml b/cmd/dep/testdata/harness_tests/init/govendor/case1/final/Gopkg.toml
@@ -1,4 +1,8 @@
-ignored = ["github.com/sdboyer/dep-test","github.com/golang/notexist/samples"]
+ignored = ["github.com/sdboyer/dep-test"]
+
+[[constraint]]
+  name = "github.com/carolynvs/go-dep-test"
+  version = "0.2.0"
 
 [[constraint]]
   name = "github.com/sdboyer/deptestdos"

diff --git a/cmd/dep/testdata/harness_tests/init/govendor/case1/initial/vendor/vendor.json b/cmd/dep/testdata/harness_tests/init/govendor/case1/initial/vendor/vendor.json
@@ -1,10 +1,9 @@
 {
 	"comment": "",
-	"ignore": "test github.com/sdboyer/dep-test",
+	"ignore": "test github.com/sdboyer/dep-test samples/",
 	"package": [
 		{
 			"checksumSHA1": "4R6TQcq0/gI/I2kKeUunuO/pEec=",
-			"origin": "github.com/carolynvs/deptest",
 			"path": "github.com/sdboyer/deptest",
 			"revision": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
 			"revisionTime": "2017-02-22T03:31:47Z"

diff --git a/cmd/dep/testdata/harness_tests/init/govendor/case1/testcase.json b/cmd/dep/testdata/harness_tests/init/govendor/case1/testcase.json
@@ -8,6 +8,7 @@
     "github.com/sdboyer/deptestdos": "5c607206be5decd28e6263ffffdcee067266015e"
   },
   "vendor-final": [
+    "github.com/carolynvs/go-dep-test",
     "github.com/sdboyer/deptest",
     "github.com/sdboyer/deptestdos"
   ]