Skip to content

Commit

Permalink
cmd/go: convert TestGoTestImportErrorStack to the script framework
Browse files Browse the repository at this point in the history
The literal string match had to be turned into a regexp, otherwise
pretty straightforward.

Part of converting all tests to script framework to improve
test parallelism.

Updates #36320
Updates #17751

Change-Id: I46f62312f02dc9adf83ed91c6f807420d29fbb12
Reviewed-on: https://go-review.googlesource.com/c/go/+/212939
Run-TryBot: Michael Matloob <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Jay Conrod <[email protected]>
  • Loading branch information
matloob committed Jan 3, 2020
1 parent 0d09b7e commit 9c3869d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 24 deletions.
14 changes: 0 additions & 14 deletions src/cmd/go/go_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3220,20 +3220,6 @@ func TestGoTestRaceFailures(t *testing.T) {
tg.grepBothNot("PASS", "something passed")
}

func TestGoTestImportErrorStack(t *testing.T) {
const out = `package testdep/p1 (test)
imports testdep/p2
imports testdep/p3: build constraints exclude all Go files `

tg := testgo(t)
defer tg.cleanup()
tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata"))
tg.runFail("test", "testdep/p1")
if !strings.Contains(tg.stderr.String(), out) {
t.Fatalf("did not give full import stack:\n\n%s", tg.stderr.String())
}
}

func TestGoGetUpdate(t *testing.T) {
// golang.org/issue/9224.
// The recursive updating was trying to walk to
Expand Down
17 changes: 17 additions & 0 deletions src/cmd/go/testdata/script/test_import_error_stack.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
! go test testdep/p1
stderr 'package testdep/p1 \(test\)\n\timports testdep/p2\n\timports testdep/p3: build constraints exclude all Go files ' # check for full import stack

-- testdep/p1/p1.go --
package p1
-- testdep/p1/p1_test.go --
package p1

import _ "testdep/p2"
-- testdep/p2/p2.go --
package p2

import _ "testdep/p3"
-- testdep/p3/p3.go --
// +build ignore

package ignored
1 change: 0 additions & 1 deletion src/cmd/go/testdata/src/testdep/p1/p1.go

This file was deleted.

3 changes: 0 additions & 3 deletions src/cmd/go/testdata/src/testdep/p1/p1_test.go

This file was deleted.

3 changes: 0 additions & 3 deletions src/cmd/go/testdata/src/testdep/p2/p2.go

This file was deleted.

3 changes: 0 additions & 3 deletions src/cmd/go/testdata/src/testdep/p3/p3.go

This file was deleted.

0 comments on commit 9c3869d

Please sign in to comment.