Add GlideImporter testdata for empty constraints

golang · Jul 26, 2017 · 81af9d6 · 81af9d6
1 parent 6a28486
commit 81af9d6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 4 deletions.
diff --git a/cmd/dep/testdata/glide/golden.txt b/cmd/dep/testdata/glide/golden.txt
@@ -2,7 +2,7 @@ Detected glide configuration files...
 Converting from glide.yaml and glide.lock...
   Using master as initial constraint for imported dep github.com/sdboyer/deptest
   Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
-  Using master as initial constraint for imported dep github.com/golang/lint
+  Using * as initial constraint for imported dep github.com/golang/lint
   Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
   Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos
-  Trying master (cb00e56) as initial lock for imported dep github.com/golang/lint
+  Trying * (cb00e56) as initial lock for imported dep github.com/golang/lint
diff --git a/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.lock b/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.lock
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,5 +1,8 @@
 ignored = ["github.com/sdboyer/dep-test","github.com/golang/notexist/samples"]
 
+[[constraint]]
+  name = "github.com/carolynvs/deptest-subpkg"
+
 [[constraint]]
   name = "github.com/sdboyer/deptestdos"
   version = "2.0.0"
diff --git a/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.lock b/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.lock
diff --git a/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.yaml b/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.yaml
@@ -16,5 +16,6 @@ import:
   version: v1.0.0
 - package: github.com/sdboyer/deptestdos
   version: v2.0.0
+- package: github.com/carolynvs/deptest-subpkg/subby
 testImport:
 - package: github.com/golang/lint
diff --git a/cmd/dep/testdata/harness_tests/init/glide/case1/initial/main.go b/cmd/dep/testdata/harness_tests/init/glide/case1/initial/main.go
@@ -7,6 +7,7 @@ package main
 import (
 	"fmt"
 
+	_ "github.com/carolynvs/deptest-subpkg/subby"
 	"github.com/sdboyer/deptestdos"
 )
 

diff --git a/cmd/dep/testdata/harness_tests/init/glide/case1/testcase.json b/cmd/dep/testdata/harness_tests/init/glide/case1/testcase.json
@@ -9,6 +9,7 @@
   },
   "vendor-final": [
     "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
+    "github.com/sdboyer/deptestdos",
+    "github.com/carolynvs/deptest-subpkg"
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ package main @@
     import (
     	"fmt"
+    	_ "github.com/carolynvs/deptest-subpkg/subby"
     	"github.com/sdboyer/deptestdos"
     )
@@ Expand Down @@