Update vendored ginkgo.
This includes onsi/ginkgo#262, which improves the JUnit stacktraces.
This commit is contained in:
		
							
								
								
									
										1
									
								
								vendor/github.com/onsi/ginkgo/.travis.yml
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								vendor/github.com/onsi/ginkgo/.travis.yml
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -1,6 +1,5 @@
 | 
			
		||||
language: go
 | 
			
		||||
go:
 | 
			
		||||
  - 1.4
 | 
			
		||||
  - 1.5
 | 
			
		||||
  - 1.6
 | 
			
		||||
  - tip
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/build_command.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/build_command.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -46,7 +46,7 @@ func (r *SpecBuilder) BuildSpecs(args []string, additionalArgs []string) {
 | 
			
		||||
 | 
			
		||||
	passed := true
 | 
			
		||||
	for _, suite := range suites {
 | 
			
		||||
		runner := testrunner.New(suite, 1, false, r.commandFlags.Race, r.commandFlags.Cover, r.commandFlags.CoverPkg, r.commandFlags.Tags, nil)
 | 
			
		||||
		runner := testrunner.New(suite, 1, false, r.commandFlags.Race, r.commandFlags.Cover, r.commandFlags.CoverPkg, r.commandFlags.Tags, r.commandFlags.GCFlags, nil)
 | 
			
		||||
		fmt.Printf("Compiling %s...\n", suite.PackageName)
 | 
			
		||||
 | 
			
		||||
		path, _ := filepath.Abs(filepath.Join(suite.Path, fmt.Sprintf("%s.test", suite.PackageName)))
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/run_command.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/run_command.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -71,7 +71,7 @@ func (r *SpecRunner) RunSpecs(args []string, additionalArgs []string) {
 | 
			
		||||
 | 
			
		||||
	runners := []*testrunner.TestRunner{}
 | 
			
		||||
	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, additionalArgs))
 | 
			
		||||
		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))
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	numSuites := 0
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/run_watch_and_build_command_flags.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/run_watch_and_build_command_flags.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -14,6 +14,7 @@ type RunWatchAndBuildCommandFlags struct {
 | 
			
		||||
	CoverPkg    string
 | 
			
		||||
	SkipPackage string
 | 
			
		||||
	Tags        string
 | 
			
		||||
	GCFlags     string
 | 
			
		||||
 | 
			
		||||
	//for run and watch commands
 | 
			
		||||
	NumCPU         int
 | 
			
		||||
@@ -96,6 +97,7 @@ func (c *RunWatchAndBuildCommandFlags) flags(mode int) {
 | 
			
		||||
	c.FlagSet.StringVar(&(c.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.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.")
 | 
			
		||||
 | 
			
		||||
	if mode == runMode || mode == watchMode {
 | 
			
		||||
		config.Flags(c.FlagSet, "", false)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/testrunner/test_runner.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/testrunner/test_runner.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -33,10 +33,11 @@ type TestRunner struct {
 | 
			
		||||
	cover          bool
 | 
			
		||||
	coverPkg       string
 | 
			
		||||
	tags           string
 | 
			
		||||
	gcFlags        string
 | 
			
		||||
	additionalArgs []string
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func New(suite testsuite.TestSuite, numCPU int, parallelStream bool, race bool, cover bool, coverPkg string, tags string, additionalArgs []string) *TestRunner {
 | 
			
		||||
func New(suite testsuite.TestSuite, numCPU int, parallelStream bool, race bool, cover bool, coverPkg string, tags string, gcFlags string, additionalArgs []string) *TestRunner {
 | 
			
		||||
	runner := &TestRunner{
 | 
			
		||||
		Suite:          suite,
 | 
			
		||||
		numCPU:         numCPU,
 | 
			
		||||
@@ -46,6 +47,7 @@ func New(suite testsuite.TestSuite, numCPU int, parallelStream bool, race bool,
 | 
			
		||||
		coverPkg:       coverPkg,
 | 
			
		||||
		tags:           tags,
 | 
			
		||||
		additionalArgs: additionalArgs,
 | 
			
		||||
		gcFlags:        gcFlags,
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if !suite.Precompiled {
 | 
			
		||||
@@ -85,6 +87,9 @@ func (t *TestRunner) CompileTo(path string) error {
 | 
			
		||||
	if t.tags != "" {
 | 
			
		||||
		args = append(args, fmt.Sprintf("-tags=%s", t.tags))
 | 
			
		||||
	}
 | 
			
		||||
	if t.gcFlags != "" {
 | 
			
		||||
		args = append(args, fmt.Sprintf("-gcflags=%s", t.gcFlags))
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	cmd := exec.Command("go", args...)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/watch_command.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/onsi/ginkgo/ginkgo/watch_command.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -57,7 +57,7 @@ func (w *SpecWatcher) runnersForSuites(suites []testsuite.TestSuite, additionalA
 | 
			
		||||
	runners := []*testrunner.TestRunner{}
 | 
			
		||||
 | 
			
		||||
	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, additionalArgs))
 | 
			
		||||
		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))
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return runners
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								vendor/github.com/onsi/ginkgo/reporters/junit_reporter.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								vendor/github.com/onsi/ginkgo/reporters/junit_reporter.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -74,6 +74,10 @@ func (reporter *JUnitReporter) AfterSuiteDidRun(setupSummary *types.SetupSummary
 | 
			
		||||
	reporter.handleSetupSummary("AfterSuite", setupSummary)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func failureMessage(failure types.SpecFailure) string {
 | 
			
		||||
	return fmt.Sprintf("%s\n%s\n%s", failure.ComponentCodeLocation.String(), failure.Message, failure.Location.String())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (reporter *JUnitReporter) handleSetupSummary(name string, setupSummary *types.SetupSummary) {
 | 
			
		||||
	if setupSummary.State != types.SpecStatePassed {
 | 
			
		||||
		testCase := JUnitTestCase{
 | 
			
		||||
@@ -83,7 +87,7 @@ func (reporter *JUnitReporter) handleSetupSummary(name string, setupSummary *typ
 | 
			
		||||
 | 
			
		||||
		testCase.FailureMessage = &JUnitFailureMessage{
 | 
			
		||||
			Type:    reporter.failureTypeForState(setupSummary.State),
 | 
			
		||||
			Message: fmt.Sprintf("%s\n%s", setupSummary.Failure.ComponentCodeLocation.String(), setupSummary.Failure.Message),
 | 
			
		||||
			Message: failureMessage(setupSummary.Failure),
 | 
			
		||||
		}
 | 
			
		||||
		testCase.Time = setupSummary.RunTime.Seconds()
 | 
			
		||||
		reporter.suite.TestCases = append(reporter.suite.TestCases, testCase)
 | 
			
		||||
@@ -98,7 +102,7 @@ func (reporter *JUnitReporter) SpecDidComplete(specSummary *types.SpecSummary) {
 | 
			
		||||
	if specSummary.State == types.SpecStateFailed || specSummary.State == types.SpecStateTimedOut || specSummary.State == types.SpecStatePanicked {
 | 
			
		||||
		testCase.FailureMessage = &JUnitFailureMessage{
 | 
			
		||||
			Type:    reporter.failureTypeForState(specSummary.State),
 | 
			
		||||
			Message: fmt.Sprintf("%s\n%s", specSummary.Failure.ComponentCodeLocation.String(), specSummary.Failure.Message),
 | 
			
		||||
			Message: failureMessage(specSummary.Failure),
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if specSummary.State == types.SpecStateSkipped || specSummary.State == types.SpecStatePending {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user