Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/getgauge/gauge
Browse files Browse the repository at this point in the history
Conflicts:
	parallelExecution.go
  • Loading branch information
apoorvam committed May 8, 2015
2 parents 789b9f1 + 4fcc1e5 commit 648a2c4
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions parallelExecution.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@ type specCollection struct {
specs []*specification
}

func (s specCollection) getAllSpecNames() []string {
specNames := make([]string, 0)
for _, spec := range s.specs {
specNames = append(specNames, spec.fileName)
}
return specNames
}

type parallelInfo struct {
inParallel bool
numberOfStreams int
Expand Down Expand Up @@ -104,7 +96,7 @@ func (e *parallelSpecExecution) startSpecsExecution(specCollection *specCollecti
if err != nil {
e.writer.Error("Failed: " + err.Error())
e.writer.Debug("Skipping %s specifications", strconv.Itoa(len(specCollection.specs)))
suiteResults <- &suiteResult{unhandledErrors: []error{streamExecError{specsSkipped: specCollection.getAllSpecNames(), message: fmt.Sprintf("Failed to start runner. %s", err.Error())}}}
suiteResults <- &suiteResult{unhandledErrors: []error{streamExecError{specsSkipped: specCollection.specNames(), message: fmt.Sprintf("Failed to start runner. %s", err.Error())}}}
return
}
e.startSpecsExecutionWithRunner(specCollection, suiteResults, runner, writer)
Expand Down Expand Up @@ -164,3 +156,11 @@ func (e *parallelSpecExecution) aggregateResults(suiteResults []*suiteResult) *s
func numberOfCores() int {
return runtime.NumCPU()
}

func (s *specCollection) specNames() []string {
specNames := make([]string, 0)
for _, spec := range s.specs {
specNames = append(specNames, spec.fileName)
}
return specNames
}

0 comments on commit 648a2c4

Please sign in to comment.