bump(github.com/onsi/gingko):bb93381d543b0e5725244abe752214a110791d01

Adds support for extracting stdout and stderr from failed tests runs into junit, which makes junit more effective for debugging failures.
parent 45242048
...@@ -1751,113 +1751,123 @@ ...@@ -1751,113 +1751,123 @@
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo", "ImportPath": "github.com/onsi/ginkgo",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/config", "ImportPath": "github.com/onsi/ginkgo/config",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/ginkgo", "ImportPath": "github.com/onsi/ginkgo/ginkgo",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/ginkgo/convert", "ImportPath": "github.com/onsi/ginkgo/ginkgo/convert",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/ginkgo/interrupthandler", "ImportPath": "github.com/onsi/ginkgo/ginkgo/interrupthandler",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/ginkgo/nodot", "ImportPath": "github.com/onsi/ginkgo/ginkgo/nodot",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/ginkgo/testrunner", "ImportPath": "github.com/onsi/ginkgo/ginkgo/testrunner",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/ginkgo/testsuite", "ImportPath": "github.com/onsi/ginkgo/ginkgo/testsuite",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/ginkgo/watch", "ImportPath": "github.com/onsi/ginkgo/ginkgo/watch",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/codelocation", "ImportPath": "github.com/onsi/ginkgo/internal/codelocation",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/containernode", "ImportPath": "github.com/onsi/ginkgo/internal/containernode",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/failer", "ImportPath": "github.com/onsi/ginkgo/internal/failer",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/leafnodes", "ImportPath": "github.com/onsi/ginkgo/internal/leafnodes",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/remote", "ImportPath": "github.com/onsi/ginkgo/internal/remote",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/spec", "ImportPath": "github.com/onsi/ginkgo/internal/spec",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/specrunner", "ImportPath": "github.com/onsi/ginkgo/internal/specrunner",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/suite", "ImportPath": "github.com/onsi/ginkgo/internal/suite",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/testingtproxy", "ImportPath": "github.com/onsi/ginkgo/internal/testingtproxy",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/internal/writer", "ImportPath": "github.com/onsi/ginkgo/internal/writer",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/reporters", "ImportPath": "github.com/onsi/ginkgo/reporters",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/reporters/stenographer", "ImportPath": "github.com/onsi/ginkgo/reporters/stenographer",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
},
{
"ImportPath": "github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable",
"Comment": "v1.2.0-90-gbb93381",
"Rev": "bb93381d543b0e5725244abe752214a110791d01"
},
{
"ImportPath": "github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty",
"Comment": "v1.2.0-90-gbb93381",
"Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/ginkgo/types", "ImportPath": "github.com/onsi/ginkgo/types",
"Comment": "v1.2.0-66-g74c678d", "Comment": "v1.2.0-90-gbb93381",
"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7" "Rev": "bb93381d543b0e5725244abe752214a110791d01"
}, },
{ {
"ImportPath": "github.com/onsi/gomega", "ImportPath": "github.com/onsi/gomega",
......
...@@ -60965,6 +60965,62 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ...@@ -60965,6 +60965,62 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
================================================================================ ================================================================================
= vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable licensed under: =
Copyright (c) 2013-2014 Onsi Fakhouri
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
= vendor/github.com/onsi/ginkgo/LICENSE 570603114d52313cb86c0206401c9af7 -
================================================================================
================================================================================
= vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty licensed under: =
Copyright (c) 2013-2014 Onsi Fakhouri
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
= vendor/github.com/onsi/ginkgo/LICENSE 570603114d52313cb86c0206401c9af7 -
================================================================================
================================================================================
= vendor/github.com/onsi/ginkgo/types licensed under: = = vendor/github.com/onsi/ginkgo/types licensed under: =
Copyright (c) 2013-2014 Onsi Fakhouri Copyright (c) 2013-2014 Onsi Fakhouri
...@@ -2,7 +2,7 @@ language: go ...@@ -2,7 +2,7 @@ language: go
go: go:
- 1.5 - 1.5
- 1.6 - 1.6
- tip - 1.7
install: install:
- go get -v -t ./... - go get -v -t ./...
......
...@@ -4,6 +4,7 @@ Improvements: ...@@ -4,6 +4,7 @@ Improvements:
- `Skip(message)` can be used to skip the current test. - `Skip(message)` can be used to skip the current test.
- Added `extensions/table` - a Ginkgo DSL for [Table Driven Tests](http://onsi.github.io/ginkgo/#table-driven-tests) - Added `extensions/table` - a Ginkgo DSL for [Table Driven Tests](http://onsi.github.io/ginkgo/#table-driven-tests)
- Add `GinkgoRandomSeed()` - shorthand for `config.GinkgoConfig.RandomSeed`
Bug Fixes: Bug Fixes:
...@@ -68,7 +69,7 @@ No changes, just dropping the beta. ...@@ -68,7 +69,7 @@ No changes, just dropping the beta.
New Features: New Features:
- `ginkgo watch` now monitors packages *and their dependencies* for changes. The depth of the dependency tree can be modified with the `-depth` flag. - `ginkgo watch` now monitors packages *and their dependencies* for changes. The depth of the dependency tree can be modified with the `-depth` flag.
- Test suites with a programmatic focus (`FIt`, `FDescribe`, etc...) exit with non-zero status code, evne when they pass. This allows CI systems to detect accidental commits of focused test suites. - Test suites with a programmatic focus (`FIt`, `FDescribe`, etc...) exit with non-zero status code, even when they pass. This allows CI systems to detect accidental commits of focused test suites.
- `ginkgo -p` runs the testsuite in parallel with an auto-detected number of nodes. - `ginkgo -p` runs the testsuite in parallel with an auto-detected number of nodes.
- `ginkgo -tags=TAG_LIST` passes a list of tags down to the `go build` command. - `ginkgo -tags=TAG_LIST` passes a list of tags down to the `go build` command.
- `ginkgo --failFast` aborts the test suite after the first failure. - `ginkgo --failFast` aborts the test suite after the first failure.
......
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"flag" "flag"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
...@@ -15,11 +16,15 @@ import ( ...@@ -15,11 +16,15 @@ import (
) )
func BuildBootstrapCommand() *Command { func BuildBootstrapCommand() *Command {
var agouti, noDot, internal bool var (
agouti, noDot, internal bool
customBootstrapFile string
)
flagSet := flag.NewFlagSet("bootstrap", flag.ExitOnError) flagSet := flag.NewFlagSet("bootstrap", flag.ExitOnError)
flagSet.BoolVar(&agouti, "agouti", false, "If set, bootstrap will generate a bootstrap file for writing Agouti tests") flagSet.BoolVar(&agouti, "agouti", false, "If set, bootstrap will generate a bootstrap file for writing Agouti tests")
flagSet.BoolVar(&noDot, "nodot", false, "If set, bootstrap will generate a bootstrap file that does not . import ginkgo and gomega") flagSet.BoolVar(&noDot, "nodot", false, "If set, bootstrap will generate a bootstrap file that does not . import ginkgo and gomega")
flagSet.BoolVar(&internal, "internal", false, "If set, generate will generate a test file that uses the regular package name") flagSet.BoolVar(&internal, "internal", false, "If set, generate will generate a test file that uses the regular package name")
flagSet.StringVar(&customBootstrapFile, "template", "", "If specified, generate will use the contents of the file passed as the bootstrap template")
return &Command{ return &Command{
Name: "bootstrap", Name: "bootstrap",
...@@ -30,7 +35,7 @@ func BuildBootstrapCommand() *Command { ...@@ -30,7 +35,7 @@ func BuildBootstrapCommand() *Command {
"Accepts the following flags:", "Accepts the following flags:",
}, },
Command: func(args []string, additionalArgs []string) { Command: func(args []string, additionalArgs []string) {
generateBootstrap(agouti, noDot, internal) generateBootstrap(agouti, noDot, internal, customBootstrapFile)
}, },
} }
} }
...@@ -132,7 +137,7 @@ func fileExists(path string) bool { ...@@ -132,7 +137,7 @@ func fileExists(path string) bool {
return false return false
} }
func generateBootstrap(agouti, noDot, internal bool) { func generateBootstrap(agouti, noDot, internal bool, customBootstrapFile string) {
packageName, bootstrapFilePrefix, formattedName := getPackageAndFormattedName() packageName, bootstrapFilePrefix, formattedName := getPackageAndFormattedName()
data := bootstrapData{ data := bootstrapData{
Package: determinePackageName(packageName, internal), Package: determinePackageName(packageName, internal),
...@@ -162,7 +167,13 @@ func generateBootstrap(agouti, noDot, internal bool) { ...@@ -162,7 +167,13 @@ func generateBootstrap(agouti, noDot, internal bool) {
defer f.Close() defer f.Close()
var templateText string var templateText string
if agouti { if customBootstrapFile != "" {
tpl, err := ioutil.ReadFile(customBootstrapFile)
if err != nil {
panic(err.Error())
}
templateText = string(tpl)
} else if agouti {
templateText = agoutiBootstrapText templateText = agoutiBootstrapText
} else { } else {
templateText = bootstrapText templateText = bootstrapText
......
...@@ -46,7 +46,7 @@ func (r *SpecBuilder) BuildSpecs(args []string, additionalArgs []string) { ...@@ -46,7 +46,7 @@ func (r *SpecBuilder) BuildSpecs(args []string, additionalArgs []string) {
passed := true passed := true
for _, suite := range suites { for _, suite := range suites {
runner := testrunner.New(suite, 1, false, r.commandFlags.Race, r.commandFlags.Cover, r.commandFlags.CoverPkg, r.commandFlags.Tags, r.commandFlags.GCFlags, nil) runner := testrunner.New(suite, 1, false, r.commandFlags.GoOpts, nil)
fmt.Printf("Compiling %s...\n", suite.PackageName) fmt.Printf("Compiling %s...\n", suite.PackageName)
path, _ := filepath.Abs(filepath.Join(suite.Path, fmt.Sprintf("%s.test", suite.PackageName))) path, _ := filepath.Abs(filepath.Join(suite.Path, fmt.Sprintf("%s.test", suite.PackageName)))
......
...@@ -34,7 +34,7 @@ func BuildGenerateCommand() *Command { ...@@ -34,7 +34,7 @@ func BuildGenerateCommand() *Command {
var specText = `package {{.Package}} var specText = `package {{.Package}}
import ( import (
. "{{.PackageImportPath}}" {{if .DotImportPackage}}. "{{.PackageImportPath}}"{{end}}
{{if .IncludeImports}}. "github.com/onsi/ginkgo"{{end}} {{if .IncludeImports}}. "github.com/onsi/ginkgo"{{end}}
{{if .IncludeImports}}. "github.com/onsi/gomega"{{end}} {{if .IncludeImports}}. "github.com/onsi/gomega"{{end}}
...@@ -48,7 +48,7 @@ var _ = Describe("{{.Subject}}", func() { ...@@ -48,7 +48,7 @@ var _ = Describe("{{.Subject}}", func() {
var agoutiSpecText = `package {{.Package}}_test var agoutiSpecText = `package {{.Package}}_test
import ( import (
. "{{.PackageImportPath}}" {{if .DotImportPackage}}. "{{.PackageImportPath}}"{{end}}
{{if .IncludeImports}}. "github.com/onsi/ginkgo"{{end}} {{if .IncludeImports}}. "github.com/onsi/ginkgo"{{end}}
{{if .IncludeImports}}. "github.com/onsi/gomega"{{end}} {{if .IncludeImports}}. "github.com/onsi/gomega"{{end}}
...@@ -76,6 +76,7 @@ type specData struct { ...@@ -76,6 +76,7 @@ type specData struct {
Subject string Subject string
PackageImportPath string PackageImportPath string
IncludeImports bool IncludeImports bool
DotImportPackage bool
} }
func generateSpec(args []string, agouti, noDot, internal bool) { func generateSpec(args []string, agouti, noDot, internal bool) {
...@@ -118,6 +119,7 @@ func generateSpecForSubject(subject string, agouti, noDot, internal bool) error ...@@ -118,6 +119,7 @@ func generateSpecForSubject(subject string, agouti, noDot, internal bool) error
Subject: formattedName, Subject: formattedName,
PackageImportPath: getPackageImportPath(), PackageImportPath: getPackageImportPath(),
IncludeImports: !noDot, IncludeImports: !noDot,
DotImportPackage: !internal,
} }
targetFile := fmt.Sprintf("%s_test.go", specFilePrefix) targetFile := fmt.Sprintf("%s_test.go", specFilePrefix)
......
...@@ -234,7 +234,7 @@ func complainAndQuit(complaint string) { ...@@ -234,7 +234,7 @@ func complainAndQuit(complaint string) {
os.Exit(1) os.Exit(1)
} }
func findSuites(args []string, recurse bool, skipPackage string, allowPrecompiled bool) ([]testsuite.TestSuite, []string) { func findSuites(args []string, recurseForAll bool, skipPackage string, allowPrecompiled bool) ([]testsuite.TestSuite, []string) {
suites := []testsuite.TestSuite{} suites := []testsuite.TestSuite{}
if len(args) > 0 { if len(args) > 0 {
...@@ -246,10 +246,15 @@ func findSuites(args []string, recurse bool, skipPackage string, allowPrecompile ...@@ -246,10 +246,15 @@ func findSuites(args []string, recurse bool, skipPackage string, allowPrecompile
continue continue
} }
} }
suites = append(suites, testsuite.SuitesInDir(arg, recurse)...) recurseForSuite := recurseForAll
if strings.HasSuffix(arg, "/...") && arg != "/..." {
arg = arg[:len(arg)-4]
recurseForSuite = true
}
suites = append(suites, testsuite.SuitesInDir(arg, recurseForSuite)...)
} }
} else { } else {
suites = testsuite.SuitesInDir(".", recurse) suites = testsuite.SuitesInDir(".", recurseForAll)
} }
skippedPackages := []string{} skippedPackages := []string{}
......
...@@ -71,7 +71,7 @@ func (r *SpecRunner) RunSpecs(args []string, additionalArgs []string) { ...@@ -71,7 +71,7 @@ func (r *SpecRunner) RunSpecs(args []string, additionalArgs []string) {
runners := []*testrunner.TestRunner{} runners := []*testrunner.TestRunner{}
for _, suite := range suites { for _, suite := range suites {
runners = append(runners, testrunner.New(suite, r.commandFlags.NumCPU, r.commandFlags.ParallelStream, r.commandFlags.Race, r.commandFlags.Cover, r.commandFlags.CoverPkg, r.commandFlags.Tags, r.commandFlags.GCFlags, additionalArgs)) runners = append(runners, testrunner.New(suite, r.commandFlags.NumCPU, r.commandFlags.ParallelStream, r.commandFlags.GoOpts, additionalArgs))
} }
numSuites := 0 numSuites := 0
......
...@@ -9,12 +9,8 @@ import ( ...@@ -9,12 +9,8 @@ import (
type RunWatchAndBuildCommandFlags struct { type RunWatchAndBuildCommandFlags struct {
Recurse bool Recurse bool
Race bool
Cover bool
CoverPkg string
SkipPackage string SkipPackage string
Tags string GoOpts map[string]interface{}
GCFlags string
//for run and watch commands //for run and watch commands
NumCPU int NumCPU int
...@@ -88,16 +84,57 @@ func (c *RunWatchAndBuildCommandFlags) computeNodes() { ...@@ -88,16 +84,57 @@ func (c *RunWatchAndBuildCommandFlags) computeNodes() {
} }
} }
func (c *RunWatchAndBuildCommandFlags) stringSlot(slot string) *string {
var opt string
c.GoOpts[slot] = &opt
return &opt
}
func (c *RunWatchAndBuildCommandFlags) boolSlot(slot string) *bool {
var opt bool
c.GoOpts[slot] = &opt
return &opt
}
func (c *RunWatchAndBuildCommandFlags) intSlot(slot string) *int {
var opt int
c.GoOpts[slot] = &opt
return &opt
}
func (c *RunWatchAndBuildCommandFlags) flags(mode int) { func (c *RunWatchAndBuildCommandFlags) flags(mode int) {
c.GoOpts = make(map[string]interface{})
onWindows := (runtime.GOOS == "windows") onWindows := (runtime.GOOS == "windows")
c.FlagSet.BoolVar(&(c.Recurse), "r", false, "Find and run test suites under the current directory recursively") c.FlagSet.BoolVar(&(c.Recurse), "r", false, "Find and run test suites under the current directory recursively.")
c.FlagSet.BoolVar(&(c.Race), "race", false, "Run tests with race detection enabled") c.FlagSet.BoolVar(c.boolSlot("race"), "race", false, "Run tests with race detection enabled.")
c.FlagSet.BoolVar(&(c.Cover), "cover", false, "Run tests with coverage analysis, will generate coverage profiles with the package name in the current directory") c.FlagSet.BoolVar(c.boolSlot("cover"), "cover", false, "Run tests with coverage analysis, will generate coverage profiles with the package name in the current directory.")
c.FlagSet.StringVar(&(c.CoverPkg), "coverpkg", "", "Run tests with coverage on the given external modules") c.FlagSet.StringVar(c.stringSlot("coverpkg"), "coverpkg", "", "Run tests with coverage on the given external modules.")
c.FlagSet.StringVar(&(c.SkipPackage), "skipPackage", "", "A comma-separated list of package names to be skipped. If any part of the package's path matches, that package is ignored.") c.FlagSet.StringVar(&(c.SkipPackage), "skipPackage", "", "A comma-separated list of package names to be skipped. If any part of the package's path matches, that package is ignored.")
c.FlagSet.StringVar(&(c.Tags), "tags", "", "A list of build tags to consider satisfied during the build") c.FlagSet.StringVar(c.stringSlot("tags"), "tags", "", "A list of build tags to consider satisfied during the build.")
c.FlagSet.StringVar(&(c.GCFlags), "gcflags", "", "Arguments to pass on each go tool compile invocation.") c.FlagSet.StringVar(c.stringSlot("gcflags"), "gcflags", "", "Arguments to pass on each go tool compile invocation.")
c.FlagSet.StringVar(c.stringSlot("covermode"), "covermode", "", "Set the mode for coverage analysis.")
c.FlagSet.BoolVar(c.boolSlot("a"), "a", false, "Force rebuilding of packages that are already up-to-date.")
c.FlagSet.BoolVar(c.boolSlot("n"), "n", false, "Have `go test` print the commands but do not run them.")
c.FlagSet.BoolVar(c.boolSlot("msan"), "msan", false, "Enable interoperation with memory sanitizer.")
c.FlagSet.BoolVar(c.boolSlot("x"), "x", false, "Have `go test` print the commands.")
c.FlagSet.BoolVar(c.boolSlot("work"), "work", false, "Print the name of the temporary work directory and do not delete it when exiting.")
c.FlagSet.StringVar(c.stringSlot("asmflags"), "asmflags", "", "Arguments to pass on each go tool asm invocation.")
c.FlagSet.StringVar(c.stringSlot("buildmode"), "buildmode", "", "Build mode to use. See 'go help buildmode' for more.")
c.FlagSet.StringVar(c.stringSlot("compiler"), "compiler", "", "Name of compiler to use, as in runtime.Compiler (gccgo or gc).")
c.FlagSet.StringVar(c.stringSlot("gccgoflags"), "gccgoflags", "", "Arguments to pass on each gccgo compiler/linker invocation.")
c.FlagSet.StringVar(c.stringSlot("installsuffix"), "installsuffix", "", "A suffix to use in the name of the package installation directory.")
c.FlagSet.StringVar(c.stringSlot("ldflags"), "ldflags", "", "Arguments to pass on each go tool link invocation.")
c.FlagSet.BoolVar(c.boolSlot("linkshared"), "linkshared", false, "Link against shared libraries previously created with -buildmode=shared.")
c.FlagSet.StringVar(c.stringSlot("pkgdir"), "pkgdir", "", "install and load all packages from the given dir instead of the usual locations.")
c.FlagSet.StringVar(c.stringSlot("toolexec"), "toolexec", "", "a program to use to invoke toolchain programs like vet and asm.")
c.FlagSet.IntVar(c.intSlot("blockprofilerate"), "blockprofilerate", 1, "Control the detail provided in goroutine blocking profiles by calling runtime.SetBlockProfileRate with the given value.")
c.FlagSet.StringVar(c.stringSlot("coverprofile"), "coverprofile", "", "Write a coverage profile to the specified file after all tests have passed.")
c.FlagSet.StringVar(c.stringSlot("cpuprofile"), "cpuprofile", "", "Write a CPU profile to the specified file before exiting.")
c.FlagSet.StringVar(c.stringSlot("memprofile"), "memprofile", "", "Write a memory profile to the specified file after all tests have passed.")
c.FlagSet.IntVar(c.intSlot("memprofilerate"), "memprofilerate", 0, "Enable more precise (and expensive) memory profiles by setting runtime.MemProfileRate.")
c.FlagSet.StringVar(c.stringSlot("outputdir"), "outputdir", "", "Place output files from profiling in the specified directory.")
if mode == runMode || mode == watchMode { if mode == runMode || mode == watchMode {
config.Flags(c.FlagSet, "", false) config.Flags(c.FlagSet, "", false)
......
...@@ -9,6 +9,7 @@ import ( ...@@ -9,6 +9,7 @@ import (
"github.com/onsi/ginkgo/ginkgo/interrupthandler" "github.com/onsi/ginkgo/ginkgo/interrupthandler"
"github.com/onsi/ginkgo/ginkgo/testrunner" "github.com/onsi/ginkgo/ginkgo/testrunner"
"github.com/onsi/ginkgo/ginkgo/testsuite" "github.com/onsi/ginkgo/ginkgo/testsuite"
colorable "github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable"
) )
type compilationInput struct { type compilationInput struct {
...@@ -166,7 +167,7 @@ func (r *SuiteRunner) listFailedSuites(suitesThatFailed []testsuite.TestSuite) { ...@@ -166,7 +167,7 @@ func (r *SuiteRunner) listFailedSuites(suitesThatFailed []testsuite.TestSuite) {
if config.DefaultReporterConfig.NoColor { if config.DefaultReporterConfig.NoColor {
fmt.Printf("\t"+packageNameFormatter+" %s\n", suite.PackageName, suite.Path) fmt.Printf("\t"+packageNameFormatter+" %s\n", suite.PackageName, suite.Path)
} else { } else {
fmt.Printf("\t%s"+packageNameFormatter+"%s %s%s%s\n", redColor, suite.PackageName, defaultStyle, lightGrayColor, suite.Path, defaultStyle) fmt.Fprintf(colorable.NewColorableStdout(), "\t%s"+packageNameFormatter+"%s %s%s%s\n", redColor, suite.PackageName, defaultStyle, lightGrayColor, suite.Path, defaultStyle)
} }
} }
} }
...@@ -29,25 +29,17 @@ type TestRunner struct { ...@@ -29,25 +29,17 @@ type TestRunner struct {
numCPU int numCPU int
parallelStream bool parallelStream bool
race bool goOpts map[string]interface{}
cover bool
coverPkg string
tags string
gcFlags string
additionalArgs []string additionalArgs []string
} }
func New(suite testsuite.TestSuite, numCPU int, parallelStream bool, race bool, cover bool, coverPkg string, tags string, gcFlags string, additionalArgs []string) *TestRunner { func New(suite testsuite.TestSuite, numCPU int, parallelStream bool, goOpts map[string]interface{}, additionalArgs []string) *TestRunner {
runner := &TestRunner{ runner := &TestRunner{
Suite: suite, Suite: suite,
numCPU: numCPU, numCPU: numCPU,
parallelStream: parallelStream, parallelStream: parallelStream,
race: race, goOpts: goOpts,
cover: cover,
coverPkg: coverPkg,
tags: tags,
additionalArgs: additionalArgs, additionalArgs: additionalArgs,
gcFlags: gcFlags,
} }
if !suite.Precompiled { if !suite.Precompiled {
...@@ -65,32 +57,80 @@ func (t *TestRunner) Compile() error { ...@@ -65,32 +57,80 @@ func (t *TestRunner) Compile() error {
return t.CompileTo(t.compilationTargetPath) return t.CompileTo(t.compilationTargetPath)
} }
func (t *TestRunner) CompileTo(path string) error { func (t *TestRunner) BuildArgs(path string) []string {
if t.compiled { args := []string{"test", "-c", "-i", "-o", path, t.Suite.Path}
return nil
if *t.goOpts["covermode"].(*string) != "" {
args = append(args, "-cover", fmt.Sprintf("-covermode=%s", *t.goOpts["covermode"].(*string)))
} else {
if *t.goOpts["cover"].(*bool) || *t.goOpts["coverpkg"].(*string) != "" {
args = append(args, "-cover", "-covermode=atomic")
}
} }
if t.Suite.Precompiled { boolOpts := []string{
return nil "a",
"n",
"msan",
"race",
"x",
"work",
"linkshared",
} }
args := []string{"test", "-c", "-i", "-o", path, t.Suite.Path} for _, opt := range boolOpts {
if t.race { if s, found := t.goOpts[opt].(*bool); found && *s {
args = append(args, "-race") args = append(args, fmt.Sprintf("-%s", opt))
}
}
intOpts := []string{
"memprofilerate",
"blockprofilerate",
} }
if t.cover || t.coverPkg != "" {
args = append(args, "-cover", "-covermode=atomic") for _, opt := range intOpts {
if s, found := t.goOpts[opt].(*int); found {
args = append(args, fmt.Sprintf("-%s=%d", opt, *s))
}
} }
if t.coverPkg != "" {
args = append(args, fmt.Sprintf("-coverpkg=%s", t.coverPkg)) stringOpts := []string{
"asmflags",
"buildmode",
"compiler",
"gccgoflags",
"installsuffix",
"ldflags",
"pkgdir",
"toolexec",
"coverprofile",
"cpuprofile",
"memprofile",
"outputdir",
"coverpkg",
"tags",
"gcflags",
}
for _, opt := range stringOpts {
if s, found := t.goOpts[opt].(*string); found && *s != "" {
args = append(args, fmt.Sprintf("-%s=%s", opt, *s))
}
} }
if t.tags != "" { return args
args = append(args, fmt.Sprintf("-tags=%s", t.tags)) }
func (t *TestRunner) CompileTo(path string) error {
if t.compiled {
return nil
} }
if t.gcFlags != "" {
args = append(args, fmt.Sprintf("-gcflags=%s", t.gcFlags)) if t.Suite.Precompiled {
return nil
} }
args := t.BuildArgs(path)
cmd := exec.Command("go", args...) cmd := exec.Command("go", args...)
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
...@@ -189,6 +229,7 @@ fixCompilationOutput..... rewrites the output to fix the paths. ...@@ -189,6 +229,7 @@ fixCompilationOutput..... rewrites the output to fix the paths.
yeah...... yeah......
*/ */
func fixCompilationOutput(output string, relToPath string) string { func fixCompilationOutput(output string, relToPath string) string {
relToPath = filepath.Join(relToPath)
re := regexp.MustCompile(`^(\S.*\.go)\:\d+\:`) re := regexp.MustCompile(`^(\S.*\.go)\:\d+\:`)
lines := strings.Split(output, "\n") lines := strings.Split(output, "\n")
for i, line := range lines { for i, line := range lines {
...@@ -198,8 +239,10 @@ func fixCompilationOutput(output string, relToPath string) string { ...@@ -198,8 +239,10 @@ func fixCompilationOutput(output string, relToPath string) string {
} }
path := line[indices[2]:indices[3]] path := line[indices[2]:indices[3]]
path = filepath.Join(relToPath, path) if filepath.Dir(path) != relToPath {
lines[i] = path + line[indices[3]:] path = filepath.Join(relToPath, path)
lines[i] = path + line[indices[3]:]
}
} }
return strings.Join(lines, "\n") return strings.Join(lines, "\n")
} }
...@@ -281,7 +324,7 @@ func (t *TestRunner) runAndStreamParallelGinkgoSuite() RunResult { ...@@ -281,7 +324,7 @@ func (t *TestRunner) runAndStreamParallelGinkgoSuite() RunResult {
os.Stdout.Sync() os.Stdout.Sync()
if t.cover || t.coverPkg != "" { if *t.goOpts["cover"].(*bool) || *t.goOpts["coverpkg"].(*string) != "" || *t.goOpts["covermode"].(*string) != "" {
t.combineCoverprofiles() t.combineCoverprofiles()
} }
...@@ -294,7 +337,7 @@ func (t *TestRunner) runParallelGinkgoSuite() RunResult { ...@@ -294,7 +337,7 @@ func (t *TestRunner) runParallelGinkgoSuite() RunResult {
writers := make([]*logWriter, t.numCPU) writers := make([]*logWriter, t.numCPU)
reports := make([]*bytes.Buffer, t.numCPU) reports := make([]*bytes.Buffer, t.numCPU)
stenographer := stenographer.New(!config.DefaultReporterConfig.NoColor) stenographer := stenographer.New(!config.DefaultReporterConfig.NoColor, config.GinkgoConfig.FlakeAttempts > 1)
aggregator := remote.NewAggregator(t.numCPU, result, config.DefaultReporterConfig, stenographer) aggregator := remote.NewAggregator(t.numCPU, result, config.DefaultReporterConfig, stenographer)
server, err := remote.NewServer(t.numCPU) server, err := remote.NewServer(t.numCPU)
...@@ -363,7 +406,7 @@ func (t *TestRunner) runParallelGinkgoSuite() RunResult { ...@@ -363,7 +406,7 @@ func (t *TestRunner) runParallelGinkgoSuite() RunResult {
os.Stdout.Sync() os.Stdout.Sync()
} }
if t.cover || t.coverPkg != "" { if *t.goOpts["cover"].(*bool) || *t.goOpts["coverpkg"].(*string) != "" || *t.goOpts["covermode"].(*string) != "" {
t.combineCoverprofiles() t.combineCoverprofiles()
} }
...@@ -372,7 +415,7 @@ func (t *TestRunner) runParallelGinkgoSuite() RunResult { ...@@ -372,7 +415,7 @@ func (t *TestRunner) runParallelGinkgoSuite() RunResult {
func (t *TestRunner) cmd(ginkgoArgs []string, stream io.Writer, node int) *exec.Cmd { func (t *TestRunner) cmd(ginkgoArgs []string, stream io.Writer, node int) *exec.Cmd {
args := []string{"--test.timeout=24h"} args := []string{"--test.timeout=24h"}
if t.cover || t.coverPkg != "" { if *t.goOpts["cover"].(*bool) || *t.goOpts["coverpkg"].(*string) != "" || *t.goOpts["covermode"].(*string) != "" {
coverprofile := "--test.coverprofile=" + t.Suite.PackageName + ".coverprofile" coverprofile := "--test.coverprofile=" + t.Suite.PackageName + ".coverprofile"
if t.numCPU > 1 { if t.numCPU > 1 {
coverprofile = fmt.Sprintf("%s.%d", coverprofile, node) coverprofile = fmt.Sprintf("%s.%d", coverprofile, node)
......
...@@ -10,6 +10,7 @@ import ( ...@@ -10,6 +10,7 @@ import (
"github.com/onsi/ginkgo/ginkgo/testrunner" "github.com/onsi/ginkgo/ginkgo/testrunner"
"github.com/onsi/ginkgo/ginkgo/testsuite" "github.com/onsi/ginkgo/ginkgo/testsuite"
"github.com/onsi/ginkgo/ginkgo/watch" "github.com/onsi/ginkgo/ginkgo/watch"
colorable "github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable"
) )
func BuildWatchCommand() *Command { func BuildWatchCommand() *Command {
...@@ -57,7 +58,7 @@ func (w *SpecWatcher) runnersForSuites(suites []testsuite.TestSuite, additionalA ...@@ -57,7 +58,7 @@ func (w *SpecWatcher) runnersForSuites(suites []testsuite.TestSuite, additionalA
runners := []*testrunner.TestRunner{} runners := []*testrunner.TestRunner{}
for _, suite := range suites { for _, suite := range suites {
runners = append(runners, testrunner.New(suite, w.commandFlags.NumCPU, w.commandFlags.ParallelStream, w.commandFlags.Race, w.commandFlags.Cover, w.commandFlags.CoverPkg, w.commandFlags.Tags, w.commandFlags.GCFlags, additionalArgs)) runners = append(runners, testrunner.New(suite, w.commandFlags.NumCPU, w.commandFlags.ParallelStream, w.commandFlags.GoOpts, additionalArgs))
} }
return runners return runners
...@@ -96,29 +97,30 @@ func (w *SpecWatcher) WatchSuites(args []string, additionalArgs []string) { ...@@ -96,29 +97,30 @@ func (w *SpecWatcher) WatchSuites(args []string, additionalArgs []string) {
case <-ticker.C: case <-ticker.C:
suites, _ := findSuites(args, w.commandFlags.Recurse, w.commandFlags.SkipPackage, false) suites, _ := findSuites(args, w.commandFlags.Recurse, w.commandFlags.SkipPackage, false)
delta, _ := deltaTracker.Delta(suites) delta, _ := deltaTracker.Delta(suites)
coloredStream := colorable.NewColorableStdout()
suitesToRun := []testsuite.TestSuite{} suitesToRun := []testsuite.TestSuite{}
if len(delta.NewSuites) > 0 { if len(delta.NewSuites) > 0 {
fmt.Printf(greenColor+"Detected %d new %s:\n"+defaultStyle, len(delta.NewSuites), pluralizedWord("suite", "suites", len(delta.NewSuites))) fmt.Fprintf(coloredStream, greenColor+"Detected %d new %s:\n"+defaultStyle, len(delta.NewSuites), pluralizedWord("suite", "suites", len(delta.NewSuites)))
for _, suite := range delta.NewSuites { for _, suite := range delta.NewSuites {
suitesToRun = append(suitesToRun, suite.Suite) suitesToRun = append(suitesToRun, suite.Suite)
fmt.Println(" " + suite.Description()) fmt.Fprintln(coloredStream, " "+suite.Description())
} }
} }
modifiedSuites := delta.ModifiedSuites() modifiedSuites := delta.ModifiedSuites()
if len(modifiedSuites) > 0 { if len(modifiedSuites) > 0 {
fmt.Println(greenColor + "\nDetected changes in:" + defaultStyle) fmt.Fprintln(coloredStream, greenColor+"\nDetected changes in:"+defaultStyle)
for _, pkg := range delta.ModifiedPackages { for _, pkg := range delta.ModifiedPackages {
fmt.Println(" " + pkg) fmt.Fprintln(coloredStream, " "+pkg)
} }
fmt.Printf(greenColor+"Will run %d %s:\n"+defaultStyle, len(modifiedSuites), pluralizedWord("suite", "suites", len(modifiedSuites))) fmt.Fprintf(coloredStream, greenColor+"Will run %d %s:\n"+defaultStyle, len(modifiedSuites), pluralizedWord("suite", "suites", len(modifiedSuites)))
for _, suite := range modifiedSuites { for _, suite := range modifiedSuites {
suitesToRun = append(suitesToRun, suite.Suite) suitesToRun = append(suitesToRun, suite.Suite)
fmt.Println(" " + suite.Description()) fmt.Fprintln(coloredStream, " "+suite.Description())
} }
fmt.Println("") fmt.Fprintln(coloredStream, "")
} }
if len(suitesToRun) > 0 { if len(suitesToRun) > 0 {
...@@ -136,7 +138,7 @@ func (w *SpecWatcher) WatchSuites(args []string, additionalArgs []string) { ...@@ -136,7 +138,7 @@ func (w *SpecWatcher) WatchSuites(args []string, additionalArgs []string) {
if result.Passed { if result.Passed {
color = greenColor color = greenColor
} }
fmt.Println(color + "\nDone. Resuming watch..." + defaultStyle) fmt.Fprintln(coloredStream, color+"\nDone. Resuming watch..."+defaultStyle)
} }
} }
......
...@@ -68,6 +68,14 @@ type GinkgoTestingT interface { ...@@ -68,6 +68,14 @@ type GinkgoTestingT interface {
Fail() Fail()
} }
//GinkgoRandomSeed returns the seed used to randomize spec execution order. It is
//useful for seeding your own pseudorandom number generators (PRNGs) to ensure
//consistent executions from run to run, where your tests contain variability (for
//example, when selecting random test data).
func GinkgoRandomSeed() int64 {
return config.GinkgoConfig.RandomSeed
}
//GinkgoParallelNode returns the parallel node number for the current ginkgo process //GinkgoParallelNode returns the parallel node number for the current ginkgo process
//The node number is 1-indexed //The node number is 1-indexed
func GinkgoParallelNode() int { func GinkgoParallelNode() int {
...@@ -218,7 +226,7 @@ func RunSpecsWithCustomReporters(t GinkgoTestingT, description string, specRepor ...@@ -218,7 +226,7 @@ func RunSpecsWithCustomReporters(t GinkgoTestingT, description string, specRepor
func buildDefaultReporter() Reporter { func buildDefaultReporter() Reporter {
remoteReportingServer := config.GinkgoConfig.StreamHost remoteReportingServer := config.GinkgoConfig.StreamHost
if remoteReportingServer == "" { if remoteReportingServer == "" {
stenographer := stenographer.New(!config.DefaultReporterConfig.NoColor) stenographer := stenographer.New(!config.DefaultReporterConfig.NoColor, config.GinkgoConfig.FlakeAttempts > 1)
return reporters.NewDefaultReporter(config.DefaultReporterConfig, stenographer) return reporters.NewDefaultReporter(config.DefaultReporterConfig, stenographer)
} else { } else {
return remote.NewForwardingReporter(remoteReportingServer, &http.Client{}, remote.NewOutputInterceptor()) return remote.NewForwardingReporter(remoteReportingServer, &http.Client{}, remote.NewOutputInterceptor())
......
...@@ -239,6 +239,7 @@ func (aggregator *Aggregator) registerSuiteEnding(suite *types.SuiteSummary) (fi ...@@ -239,6 +239,7 @@ func (aggregator *Aggregator) registerSuiteEnding(suite *types.SuiteSummary) (fi
aggregatedSuiteSummary.NumberOfFailedSpecs += suiteSummary.NumberOfFailedSpecs aggregatedSuiteSummary.NumberOfFailedSpecs += suiteSummary.NumberOfFailedSpecs
aggregatedSuiteSummary.NumberOfPendingSpecs += suiteSummary.NumberOfPendingSpecs aggregatedSuiteSummary.NumberOfPendingSpecs += suiteSummary.NumberOfPendingSpecs
aggregatedSuiteSummary.NumberOfSkippedSpecs += suiteSummary.NumberOfSkippedSpecs aggregatedSuiteSummary.NumberOfSkippedSpecs += suiteSummary.NumberOfSkippedSpecs
aggregatedSuiteSummary.NumberOfFlakedSpecs += suiteSummary.NumberOfFlakedSpecs
} }
aggregatedSuiteSummary.RunTime = time.Since(aggregator.startTime) aggregatedSuiteSummary.RunTime = time.Since(aggregator.startTime)
......
...@@ -271,6 +271,9 @@ func (runner *SpecRunner) reportSpecWillRun(summary *types.SpecSummary) { ...@@ -271,6 +271,9 @@ func (runner *SpecRunner) reportSpecWillRun(summary *types.SpecSummary) {
} }
func (runner *SpecRunner) reportSpecDidComplete(summary *types.SpecSummary, failed bool) { func (runner *SpecRunner) reportSpecDidComplete(summary *types.SpecSummary, failed bool) {
if failed && len(summary.CapturedOutput) == 0 {
summary.CapturedOutput = string(runner.writer.Bytes())
}
for i := len(runner.reporters) - 1; i >= 1; i-- { for i := len(runner.reporters) - 1; i >= 1; i-- {
runner.reporters[i].SpecDidComplete(summary) runner.reporters[i].SpecDidComplete(summary)
} }
......
...@@ -50,7 +50,7 @@ func (t *ginkgoTestingTProxy) Log(args ...interface{}) { ...@@ -50,7 +50,7 @@ func (t *ginkgoTestingTProxy) Log(args ...interface{}) {
} }
func (t *ginkgoTestingTProxy) Logf(format string, args ...interface{}) { func (t *ginkgoTestingTProxy) Logf(format string, args ...interface{}) {
fmt.Fprintf(t.writer, format, args...) t.Log(fmt.Sprintf(format, args...))
} }
func (t *ginkgoTestingTProxy) Failed() bool { func (t *ginkgoTestingTProxy) Failed() bool {
...@@ -65,7 +65,7 @@ func (t *ginkgoTestingTProxy) Skip(args ...interface{}) { ...@@ -65,7 +65,7 @@ func (t *ginkgoTestingTProxy) Skip(args ...interface{}) {
} }
func (t *ginkgoTestingTProxy) Skipf(format string, args ...interface{}) { func (t *ginkgoTestingTProxy) Skipf(format string, args ...interface{}) {
fmt.Printf(format, args...) t.Skip(fmt.Sprintf(format, args...))
} }
func (t *ginkgoTestingTProxy) SkipNow() { func (t *ginkgoTestingTProxy) SkipNow() {
......
...@@ -26,6 +26,11 @@ func (writer *FakeGinkgoWriter) DumpOutWithHeader(header string) { ...@@ -26,6 +26,11 @@ func (writer *FakeGinkgoWriter) DumpOutWithHeader(header string) {
writer.EventStream = append(writer.EventStream, "DUMP_WITH_HEADER: "+header) writer.EventStream = append(writer.EventStream, "DUMP_WITH_HEADER: "+header)
} }
func (writer *FakeGinkgoWriter) Bytes() []byte {
writer.EventStream = append(writer.EventStream, "BYTES")
return nil
}
func (writer *FakeGinkgoWriter) Write(data []byte) (n int, err error) { func (writer *FakeGinkgoWriter) Write(data []byte) (n int, err error) {
return 0, nil return 0, nil
} }
...@@ -12,6 +12,7 @@ type WriterInterface interface { ...@@ -12,6 +12,7 @@ type WriterInterface interface {
Truncate() Truncate()
DumpOut() DumpOut()
DumpOutWithHeader(header string) DumpOutWithHeader(header string)
Bytes() []byte
} }
type Writer struct { type Writer struct {
...@@ -40,11 +41,11 @@ func (w *Writer) Write(b []byte) (n int, err error) { ...@@ -40,11 +41,11 @@ func (w *Writer) Write(b []byte) (n int, err error) {
w.lock.Lock() w.lock.Lock()
defer w.lock.Unlock() defer w.lock.Unlock()
n, err = w.buffer.Write(b)
if w.stream { if w.stream {
return w.outWriter.Write(b) return w.outWriter.Write(b)
} else {
return w.buffer.Write(b)
} }
return n, err
} }
func (w *Writer) Truncate() { func (w *Writer) Truncate() {
...@@ -61,6 +62,15 @@ func (w *Writer) DumpOut() { ...@@ -61,6 +62,15 @@ func (w *Writer) DumpOut() {
} }
} }
func (w *Writer) Bytes() []byte {
w.lock.Lock()
defer w.lock.Unlock()
b := w.buffer.Bytes()
copied := make([]byte, len(b))
copy(copied, b)
return copied
}
func (w *Writer) DumpOutWithHeader(header string) { func (w *Writer) DumpOutWithHeader(header string) {
w.lock.Lock() w.lock.Lock()
defer w.lock.Unlock() defer w.lock.Unlock()
......
...@@ -31,6 +31,7 @@ type JUnitTestCase struct { ...@@ -31,6 +31,7 @@ type JUnitTestCase struct {
FailureMessage *JUnitFailureMessage `xml:"failure,omitempty"` FailureMessage *JUnitFailureMessage `xml:"failure,omitempty"`
Skipped *JUnitSkipped `xml:"skipped,omitempty"` Skipped *JUnitSkipped `xml:"skipped,omitempty"`
Time float64 `xml:"time,attr"` Time float64 `xml:"time,attr"`
SystemOut string `xml:"system-out,omitempty"`
} }
type JUnitFailureMessage struct { type JUnitFailureMessage struct {
...@@ -89,6 +90,7 @@ func (reporter *JUnitReporter) handleSetupSummary(name string, setupSummary *typ ...@@ -89,6 +90,7 @@ func (reporter *JUnitReporter) handleSetupSummary(name string, setupSummary *typ
Type: reporter.failureTypeForState(setupSummary.State), Type: reporter.failureTypeForState(setupSummary.State),
Message: failureMessage(setupSummary.Failure), Message: failureMessage(setupSummary.Failure),
} }
testCase.SystemOut = setupSummary.CapturedOutput
testCase.Time = setupSummary.RunTime.Seconds() testCase.Time = setupSummary.RunTime.Seconds()
reporter.suite.TestCases = append(reporter.suite.TestCases, testCase) reporter.suite.TestCases = append(reporter.suite.TestCases, testCase)
} }
...@@ -104,6 +106,7 @@ func (reporter *JUnitReporter) SpecDidComplete(specSummary *types.SpecSummary) { ...@@ -104,6 +106,7 @@ func (reporter *JUnitReporter) SpecDidComplete(specSummary *types.SpecSummary) {
Type: reporter.failureTypeForState(specSummary.State), Type: reporter.failureTypeForState(specSummary.State),
Message: failureMessage(specSummary.Failure), Message: failureMessage(specSummary.Failure),
} }
testCase.SystemOut = specSummary.CapturedOutput
} }
if specSummary.State == types.SpecStateSkipped || specSummary.State == types.SpecStatePending { if specSummary.State == types.SpecStateSkipped || specSummary.State == types.SpecStatePending {
testCase.Skipped = &JUnitSkipped{} testCase.Skipped = &JUnitSkipped{}
......
...@@ -22,24 +22,24 @@ func (s *consoleStenographer) colorize(colorCode string, format string, args ... ...@@ -22,24 +22,24 @@ func (s *consoleStenographer) colorize(colorCode string, format string, args ...
} }
func (s *consoleStenographer) printBanner(text string, bannerCharacter string) { func (s *consoleStenographer) printBanner(text string, bannerCharacter string) {
fmt.Println(text) fmt.Fprintln(s.w, text)
fmt.Println(strings.Repeat(bannerCharacter, len(text))) fmt.Fprintln(s.w, strings.Repeat(bannerCharacter, len(text)))
} }
func (s *consoleStenographer) printNewLine() { func (s *consoleStenographer) printNewLine() {
fmt.Println("") fmt.Fprintln(s.w, "")
} }
func (s *consoleStenographer) printDelimiter() { func (s *consoleStenographer) printDelimiter() {
fmt.Println(s.colorize(grayColor, "%s", strings.Repeat("-", 30))) fmt.Fprintln(s.w, s.colorize(grayColor, "%s", strings.Repeat("-", 30)))
} }
func (s *consoleStenographer) print(indentation int, format string, args ...interface{}) { func (s *consoleStenographer) print(indentation int, format string, args ...interface{}) {
fmt.Print(s.indent(indentation, format, args...)) fmt.Fprint(s.w, s.indent(indentation, format, args...))
} }
func (s *consoleStenographer) println(indentation int, format string, args ...interface{}) { func (s *consoleStenographer) println(indentation int, format string, args ...interface{}) {
fmt.Println(s.indent(indentation, format, args...)) fmt.Fprintln(s.w, s.indent(indentation, format, args...))
} }
func (s *consoleStenographer) indent(indentation int, format string, args ...interface{}) string { func (s *consoleStenographer) indent(indentation int, format string, args ...interface{}) string {
......
...@@ -8,9 +8,11 @@ package stenographer ...@@ -8,9 +8,11 @@ package stenographer
import ( import (
"fmt" "fmt"
"io"
"runtime" "runtime"
"strings" "strings"
"github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable"
"github.com/onsi/ginkgo/types" "github.com/onsi/ginkgo/types"
) )
...@@ -59,22 +61,26 @@ type Stenographer interface { ...@@ -59,22 +61,26 @@ type Stenographer interface {
SummarizeFailures(summaries []*types.SpecSummary) SummarizeFailures(summaries []*types.SpecSummary)
} }
func New(color bool) Stenographer { func New(color bool, enableFlakes bool) Stenographer {
denoter := "•" denoter := "•"
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
denoter = "+" denoter = "+"
} }
return &consoleStenographer{ return &consoleStenographer{
color: color, color: color,
denoter: denoter, denoter: denoter,
cursorState: cursorStateTop, cursorState: cursorStateTop,
enableFlakes: enableFlakes,
w: colorable.NewColorableStdout(),
} }
} }
type consoleStenographer struct { type consoleStenographer struct {
color bool color bool
denoter string denoter string
cursorState cursorStateType cursorState cursorStateType
enableFlakes bool
w io.Writer
} }
var alternatingColors = []string{defaultStyle, grayColor} var alternatingColors = []string{defaultStyle, grayColor}
...@@ -153,11 +159,16 @@ func (s *consoleStenographer) AnnounceSpecRunCompletion(summary *types.SuiteSumm ...@@ -153,11 +159,16 @@ func (s *consoleStenographer) AnnounceSpecRunCompletion(summary *types.SuiteSumm
status = s.colorize(boldStyle+redColor, "FAIL!") status = s.colorize(boldStyle+redColor, "FAIL!")
} }
flakes := ""
if s.enableFlakes {
flakes = " | " + s.colorize(yellowColor+boldStyle, "%d Flaked", summary.NumberOfFlakedSpecs)
}
s.print(0, s.print(0,
"%s -- %s | %s | %s | %s ", "%s -- %s | %s | %s | %s ",
status, status,
s.colorize(greenColor+boldStyle, "%d Passed", summary.NumberOfPassedSpecs), s.colorize(greenColor+boldStyle, "%d Passed", summary.NumberOfPassedSpecs),
s.colorize(redColor+boldStyle, "%d Failed", summary.NumberOfFailedSpecs), s.colorize(redColor+boldStyle, "%d Failed", summary.NumberOfFailedSpecs)+flakes,
s.colorize(yellowColor+boldStyle, "%d Pending", summary.NumberOfPendingSpecs), s.colorize(yellowColor+boldStyle, "%d Pending", summary.NumberOfPendingSpecs),
s.colorize(cyanColor+boldStyle, "%d Skipped", summary.NumberOfSkippedSpecs), s.colorize(cyanColor+boldStyle, "%d Skipped", summary.NumberOfSkippedSpecs),
) )
......
The MIT License (MIT)
Copyright (c) 2016 Yasuhiro Matsumoto
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
# go-colorable
Colorable writer for windows.
For example, most of logger packages doesn't show colors on windows. (I know we can do it with ansicon. But I don't want.)
This package is possible to handle escape sequence for ansi color on windows.
## Too Bad!
![](https://raw.githubusercontent.com/mattn/go-colorable/gh-pages/bad.png)
## So Good!
![](https://raw.githubusercontent.com/mattn/go-colorable/gh-pages/good.png)
## Usage
```go
logrus.SetFormatter(&logrus.TextFormatter{ForceColors: true})
logrus.SetOutput(colorable.NewColorableStdout())
logrus.Info("succeeded")
logrus.Warn("not correct")
logrus.Error("something error")
logrus.Fatal("panic")
```
You can compile above code on non-windows OSs.
## Installation
```
$ go get github.com/mattn/go-colorable
```
# License
MIT
# Author
Yasuhiro Matsumoto (a.k.a mattn)
// +build !windows
package colorable
import (
"io"
"os"
)
func NewColorable(file *os.File) io.Writer {
if file == nil {
panic("nil passed instead of *os.File to NewColorable()")
}
return file
}
func NewColorableStdout() io.Writer {
return os.Stdout
}
func NewColorableStderr() io.Writer {
return os.Stderr
}
package colorable
import (
"bytes"
"fmt"
"io"
)
type NonColorable struct {
out io.Writer
lastbuf bytes.Buffer
}
func NewNonColorable(w io.Writer) io.Writer {
return &NonColorable{out: w}
}
func (w *NonColorable) Write(data []byte) (n int, err error) {
er := bytes.NewBuffer(data)
loop:
for {
c1, _, err := er.ReadRune()
if err != nil {
break loop
}
if c1 != 0x1b {
fmt.Fprint(w.out, string(c1))
continue
}
c2, _, err := er.ReadRune()
if err != nil {
w.lastbuf.WriteRune(c1)
break loop
}
if c2 != 0x5b {
w.lastbuf.WriteRune(c1)
w.lastbuf.WriteRune(c2)
continue
}
var buf bytes.Buffer
for {
c, _, err := er.ReadRune()
if err != nil {
w.lastbuf.WriteRune(c1)
w.lastbuf.WriteRune(c2)
w.lastbuf.Write(buf.Bytes())
break loop
}
if ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '@' {
break
}
buf.Write([]byte(string(c)))
}
}
return len(data) - w.lastbuf.Len(), nil
}
Copyright (c) Yasuhiro MATSUMOTO <mattn.jp@gmail.com>
MIT License (Expat)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# go-isatty
isatty for golang
## Usage
```go
package main
import (
"fmt"
"github.com/mattn/go-isatty"
"os"
)
func main() {
if isatty.IsTerminal(os.Stdout.Fd()) {
fmt.Println("Is Terminal")
} else {
fmt.Println("Is Not Terminal")
}
}
```
## Installation
```
$ go get github.com/mattn/go-isatty
```
# License
MIT
# Author
Yasuhiro Matsumoto (a.k.a mattn)
// Package isatty implements interface to isatty
package isatty
// +build appengine
package isatty
// IsTerminal returns true if the file descriptor is terminal which
// is always false on on appengine classic which is a sandboxed PaaS.
func IsTerminal(fd uintptr) bool {
return false
}
// +build darwin freebsd openbsd netbsd
// +build !appengine
package isatty
import (
"syscall"
"unsafe"
)
const ioctlReadTermios = syscall.TIOCGETA
// IsTerminal return true if the file descriptor is terminal.
func IsTerminal(fd uintptr) bool {
var termios syscall.Termios
_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
return err == 0
}
// +build linux
// +build !appengine
package isatty
import (
"syscall"
"unsafe"
)
const ioctlReadTermios = syscall.TCGETS
// IsTerminal return true if the file descriptor is terminal.
func IsTerminal(fd uintptr) bool {
var termios syscall.Termios
_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
return err == 0
}
// +build solaris
// +build !appengine
package isatty
import (
"golang.org/x/sys/unix"
)
// IsTerminal returns true if the given file descriptor is a terminal.
// see: http://src.illumos.org/source/xref/illumos-gate/usr/src/lib/libbc/libc/gen/common/isatty.c
func IsTerminal(fd uintptr) bool {
var termio unix.Termio
err := unix.IoctlSetTermio(int(fd), unix.TCGETA, &termio)
return err == nil
}
// +build windows
// +build !appengine
package isatty
import (
"syscall"
"unsafe"
)
var kernel32 = syscall.NewLazyDLL("kernel32.dll")
var procGetConsoleMode = kernel32.NewProc("GetConsoleMode")
// IsTerminal return true if the file descriptor is terminal.
func IsTerminal(fd uintptr) bool {
var st uint32
r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, fd, uintptr(unsafe.Pointer(&st)), 0)
return r != 0 && e == 0
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment