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

Collect Applicable Constraints - Test Cleanup #1493

Merged
merged 3 commits into from
Dec 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions cmd/dep/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -407,23 +407,15 @@ func TestCollectConstraints(t *testing.T) {
h := test.NewHelper(t)
defer h.Cleanup()

h.TempDir("src")
pwd := h.Path(".")
h.TempFile(filepath.Join("src", "dep.go"), `
package dep
import (
_ "github.com/boltdb/bolt"
_ "github.com/sdboyer/deptest"
_ "github.com/sdboyer/dep-test"
_ "github.com/sdboyer/deptestdos"
)
type FooBar int
`)
testdir := filepath.Join("src", "collect_constraints_test")
h.TempDir(testdir)
h.TempCopy(filepath.Join(testdir, "main.go"), filepath.Join("status", "collect_constraints", "main.go"))
testProjPath := h.Path(testdir)

discardLogger := log.New(ioutil.Discard, "", 0)

ctx := &dep.Ctx{
GOPATH: pwd,
GOPATH: testProjPath,
Out: discardLogger,
Err: discardLogger,
}
Expand All @@ -435,7 +427,7 @@ func TestCollectConstraints(t *testing.T) {
// Create new project and set root. Setting root is required for PackageList
// to run properly.
p := new(dep.Project)
p.SetRoot(filepath.Join(pwd, "src"))
p.SetRoot(testProjPath)

for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
Expand Down
14 changes: 14 additions & 0 deletions cmd/dep/testdata/status/collect_constraints/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright 2017 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
_ "github.com/boltdb/bolt"
_ "github.com/sdboyer/dep-test"
_ "github.com/sdboyer/deptest"
_ "github.com/sdboyer/deptestdos"
)

type FooBar int