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

Commit dada3b5

Browse files
committed
allow dirs that don't contain go files
1 parent 13df556 commit dada3b5

File tree

5 files changed

+23
-17
lines changed

5 files changed

+23
-17
lines changed

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
["init", "-no-examples", "-skip-tools"],
44
["ensure", "-update"]
55
],
6-
"error-expected": "no dirs contained any Go code",
6+
"error-expected": "",
77
"vendor-final": []
88
}

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/final/Gopkg.lock

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/testcase.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"commands": [
33
["ensure"]
44
],
5-
"error-expected": "found 1 errors",
5+
"error-expected": "",
66
"vendor-final": []
77
}

gps/pkgtree/pkgtree.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,6 @@ func fillPackage(p *build.Package) error {
221221
return err
222222
}
223223

224-
if len(gofiles) == 0 {
225-
return &build.NoGoError{Dir: p.Dir}
226-
}
227-
228224
var testImports []string
229225
var imports []string
230226
var importComments []string

gps/pkgtree/pkgtree_test.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package pkgtree
66

77
import (
88
"fmt"
9-
"go/build"
109
"go/scanner"
1110
"go/token"
1211
"io/ioutil"
@@ -18,6 +17,7 @@ import (
1817
"strings"
1918
"testing"
2019

20+
"github.com/davecgh/go-spew/spew"
2121
"github.com/golang/dep/gps/paths"
2222
"github.com/golang/dep/internal/fs"
2323
)
@@ -489,8 +489,9 @@ func TestListPackages(t *testing.T) {
489489
ImportRoot: "empty",
490490
Packages: map[string]PackageOrErr{
491491
"empty": {
492-
Err: &build.NoGoError{
493-
Dir: j("empty"),
492+
P: Package{
493+
ImportPath: "empty",
494+
Imports: []string{},
494495
},
495496
},
496497
},
@@ -733,8 +734,9 @@ func TestListPackages(t *testing.T) {
733734
ImportRoot: "ren",
734735
Packages: map[string]PackageOrErr{
735736
"ren": {
736-
Err: &build.NoGoError{
737-
Dir: j("ren"),
737+
P: Package{
738+
ImportPath: "ren",
739+
Imports: []string{},
738740
},
739741
},
740742
"ren/m1p": {
@@ -1653,8 +1655,9 @@ func TestListPackagesNoPerms(t *testing.T) {
16531655
ImportRoot: "ren",
16541656
Packages: map[string]PackageOrErr{
16551657
"ren": {
1656-
Err: &build.NoGoError{
1657-
Dir: workdir,
1658+
P: Package{
1659+
ImportPath: "ren",
1660+
Imports: []string{},
16581661
},
16591662
},
16601663
"ren/m1p": {
@@ -1673,6 +1676,8 @@ func TestListPackagesNoPerms(t *testing.T) {
16731676

16741677
got, err := ListPackages(workdir, "ren")
16751678

1679+
spew.Dump(got)
1680+
16761681
if err != nil {
16771682
t.Fatalf("Unexpected err from ListPackages: %s", err)
16781683
}
@@ -1690,10 +1695,6 @@ func TestListPackagesNoPerms(t *testing.T) {
16901695
}
16911696
}
16921697

1693-
if got.Packages["ren"].Err == nil {
1694-
t.Error("Should have gotten error on empty root directory")
1695-
}
1696-
16971698
if !reflect.DeepEqual(got.Packages["ren/m1p"].P.Imports, want.Packages["ren/m1p"].P.Imports) {
16981699
t.Error("Mismatch between imports in m1p")
16991700
}

0 commit comments

Comments
 (0)