diff --git a/cmd/dep/testdata/glide/golden.txt b/cmd/dep/testdata/glide/golden.txt index 67d15c26be..4155025ef8 100644 --- 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 index 56f9bb2b7a..74aad6763b 100644 --- a/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.lock +++ b/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.lock @@ -1,6 +1,11 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +[[projects]] + name = "github.com/carolynvs/deptest-subpkg" + packages = ["subby"] + revision = "6c41d90f78bb1015696a2ad591debfa8971512d5" + [[projects]] name = "github.com/sdboyer/deptest" packages = ["."] @@ -16,6 +21,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "c53803413bd0160505cce903e1cba743e0b964088f8cc42a6123f6fe1a0ae9d3" + inputs-digest = "7efcfca7f138c3579d22b4ef788294649c734ea630124fb8fbb47acf8770b086" solver-name = "gps-cdcl" solver-version = 1 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 index ab7893d76e..f9d63b74dc 100644 --- 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 index 1d29509927..7a36a4a039 100644 --- a/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.lock +++ b/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.lock @@ -7,6 +7,8 @@ imports: version: ff2948a2ac8f538c4ecd55962e919d1e13e74baf - name: github.com/sdboyer/deptestdos version: 5c607206be5decd28e6263ffffdcee067266015e +- name: github.com/carolynvs/deptest-subpkg/subby + version: 6c41d90f78bb1015696a2ad591debfa8971512d5 testImports: - name: github.com/golang/lint version: cb00e5669539f047b2f4c53a421a01b0c8e172c6 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 index ee269a398d..64b8b6b620 100644 --- 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 index 2b2c7c396e..5238b24923 100644 --- 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 index e119765489..d9466442cb 100644 --- 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" ] }