Skip to content

Commit

Permalink
refactor: no err on worker pool creation (#968)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexplischke authored Nov 5, 2024
1 parent 070943a commit f512bf3
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 30 deletions.
4 changes: 2 additions & 2 deletions internal/saucecloud/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ type result struct {
// ConsoleLogAsset represents job asset log file name.
const ConsoleLogAsset = "console.log"

func (r *CloudRunner) createWorkerPool(ccy int, maxRetries int) (chan job.StartOptions, chan result, error) {
func (r *CloudRunner) createWorkerPool(ccy int, maxRetries int) (chan job.StartOptions, chan result) {
jobOpts := make(chan job.StartOptions, maxRetries+1)
results := make(chan result, ccy)

Expand All @@ -99,7 +99,7 @@ func (r *CloudRunner) createWorkerPool(ccy int, maxRetries int) (chan job.StartO
go r.runJobs(jobOpts, results)
}

return jobOpts, results, nil
return jobOpts, results
}

func (r *CloudRunner) collectResults(results chan result, expected int) bool {
Expand Down
5 changes: 1 addition & 4 deletions internal/saucecloud/cucumber.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,7 @@ func (r *CucumberRunner) runSuites(app string, otherApps []string) bool {
sigChan := r.registerSkipSuitesOnSignal()
defer unregisterSignalCapture(sigChan)

jobOpts, results, err := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
if err != nil {
return false
}
jobOpts, results := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
defer close(results)

suites := r.Project.Suites
Expand Down
5 changes: 1 addition & 4 deletions internal/saucecloud/cypress.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ func (r *CypressRunner) validateFramework(m framework.Metadata) error {
func (r *CypressRunner) runSuites(app string, otherApps []string) bool {
sigChan := r.registerSkipSuitesOnSignal()
defer unregisterSignalCapture(sigChan)
jobOpts, results, err := r.createWorkerPool(r.Project.GetSauceCfg().Concurrency, r.Project.GetSauceCfg().Retries)
if err != nil {
return false
}
jobOpts, results := r.createWorkerPool(r.Project.GetSauceCfg().Concurrency, r.Project.GetSauceCfg().Retries)
defer close(results)

suites := r.Project.GetSuites()
Expand Down
5 changes: 1 addition & 4 deletions internal/saucecloud/espresso.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,9 @@ func (r *EspressoRunner) runSuites() bool {
sigChan := r.registerSkipSuitesOnSignal()
defer unregisterSignalCapture(sigChan)

jobOpts, results, err := r.createWorkerPool(
jobOpts, results := r.createWorkerPool(
r.Project.Sauce.Concurrency, r.Project.Sauce.Retries,
)
if err != nil {
return false
}
defer close(results)

suites := r.Project.Suites
Expand Down
5 changes: 1 addition & 4 deletions internal/saucecloud/playwright.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,7 @@ func (r *PlaywrightRunner) runSuites(app string, otherApps []string) bool {
sigChan := r.registerSkipSuitesOnSignal()
defer unregisterSignalCapture(sigChan)

jobOpts, results, err := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
if err != nil {
return false
}
jobOpts, results := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
defer close(results)

suites := r.Project.Suites
Expand Down
5 changes: 1 addition & 4 deletions internal/saucecloud/replay.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ func (r *ReplayRunner) runSuites(fileURI string) bool {
sigChan := r.registerSkipSuitesOnSignal()
defer unregisterSignalCapture(sigChan)

jobOpts, results, err := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
if err != nil {
return false
}
jobOpts, results := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
defer close(results)

suites := r.Project.Suites
Expand Down
5 changes: 1 addition & 4 deletions internal/saucecloud/testcafe.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,7 @@ func (r *TestcafeRunner) runSuites(app string, otherApps []string) bool {
sigChan := r.registerSkipSuitesOnSignal()
defer unregisterSignalCapture(sigChan)

jobOpts, results, err := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
if err != nil {
return false
}
jobOpts, results := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
defer close(results)

suites := r.Project.Suites
Expand Down
5 changes: 1 addition & 4 deletions internal/saucecloud/xcuitest.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,7 @@ func (r *XcuitestRunner) runSuites() bool {
sigChan := r.registerSkipSuitesOnSignal()
defer unregisterSignalCapture(sigChan)

jobOpts, results, err := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
if err != nil {
return false
}
jobOpts, results := r.createWorkerPool(r.Project.Sauce.Concurrency, r.Project.Sauce.Retries)
defer close(results)

suites := r.Project.Suites
Expand Down

0 comments on commit f512bf3

Please sign in to comment.