Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 81af9d6

Browse files
committed
Add GlideImporter testdata for empty constraints
1 parent 6a28486 commit 81af9d6

File tree

7 files changed

+17
-4
lines changed

7 files changed

+17
-4
lines changed

cmd/dep/testdata/glide/golden.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Detected glide configuration files...
22
Converting from glide.yaml and glide.lock...
33
Using master as initial constraint for imported dep github.com/sdboyer/deptest
44
Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
5-
Using master as initial constraint for imported dep github.com/golang/lint
5+
Using * as initial constraint for imported dep github.com/golang/lint
66
Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
77
Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos
8-
Trying master (cb00e56) as initial lock for imported dep github.com/golang/lint
8+
Trying * (cb00e56) as initial lock for imported dep github.com/golang/lint

cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.lock

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
ignored = ["github.com/sdboyer/dep-test","github.com/golang/notexist/samples"]
22

3+
[[constraint]]
4+
name = "github.com/carolynvs/deptest-subpkg"
5+
36
[[constraint]]
47
name = "github.com/sdboyer/deptestdos"
58
version = "2.0.0"

cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.lock

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ import:
1616
version: v1.0.0
1717
- package: github.com/sdboyer/deptestdos
1818
version: v2.0.0
19+
- package: github.com/carolynvs/deptest-subpkg/subby
1920
testImport:
2021
- package: github.com/golang/lint

cmd/dep/testdata/harness_tests/init/glide/case1/initial/main.go

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package main
77
import (
88
"fmt"
99

10+
_ "github.com/carolynvs/deptest-subpkg/subby"
1011
"github.com/sdboyer/deptestdos"
1112
)
1213

cmd/dep/testdata/harness_tests/init/glide/case1/testcase.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
},
1010
"vendor-final": [
1111
"github.com/sdboyer/deptest",
12-
"github.com/sdboyer/deptestdos"
12+
"github.com/sdboyer/deptestdos",
13+
"github.com/carolynvs/deptest-subpkg"
1314
]
1415
}

0 commit comments

Comments
 (0)