55package mage
66
77import (
8+ "errors"
89 "fmt"
910 "os"
1011 "path/filepath"
1112 "strconv"
1213
13- "github.com/joeshaw/multierror"
1414 "github.com/magefile/mage/mg"
15- "github.com/pkg/errors"
1615)
1716
1817const (
@@ -85,7 +84,7 @@ func (steps IntegrationTestSteps) Setup(env map[string]string) error {
8584 // errors ignored
8685 _ = steps .teardownFrom (prev , env )
8786 }
88- return errors . Wrapf ( err , "%s setup failed" , step .Name ())
87+ return fmt . Errorf ( "%s setup failed: %w " , step .Name (), err )
8988 }
9089 }
9190 return nil
@@ -101,16 +100,16 @@ func (steps IntegrationTestSteps) Teardown(env map[string]string) error {
101100}
102101
103102func (steps IntegrationTestSteps ) teardownFrom (start int , env map [string ]string ) error {
104- var errs multierror. Errors
103+ var errs [] error
105104 for i := start ; i >= 0 ; i -- {
106105 if mg .Verbose () {
107106 fmt .Printf ("Teardown %s...\n " , steps [i ].Name ())
108107 }
109108 if err := steps [i ].Teardown (env ); err != nil {
110- errs = append (errs , errors . Wrapf ( err , "%s teardown failed" , steps [i ].Name ()))
109+ errs = append (errs , fmt . Errorf ( "%s teardown failed: %w " , steps [i ].Name (), err ))
111110 }
112111 }
113- return errs . Err ( )
112+ return errors . Join ( errs ... )
114113}
115114
116115// IntegrationTester is interface used by the actual test runner.
@@ -149,34 +148,19 @@ func NewIntegrationRunners(path string, passInEnv map[string]string) (Integratio
149148 }
150149 dir := filepath .Join (cwd , path )
151150
152- // Load the overall steps to use (skipped inside of test environment, as they are never ran on the inside).
153- // These steps are duplicated per scenario.
154- var steps IntegrationTestSteps
155- if ! IsInIntegTestEnv () {
156- for _ , step := range globalIntegrationTestSetupSteps {
157- use , err := step .Use (dir )
158- if err != nil {
159- return nil , errors .Wrapf (err , "%s step failed on Use" , step .Name ())
160- }
161- if use {
162- steps = append (steps , step )
163- }
164- }
165- }
166-
167151 // Create the runners (can only be multiple).
168152 var runners IntegrationRunners
169153 for _ , t := range globalIntegrationTesters {
170154 use , err := t .Use (dir )
171155 if err != nil {
172- return nil , errors . Wrapf ( err , "%s tester failed on Use" , t .Name ())
156+ return nil , fmt . Errorf ( "%s tester failed on Use: %w " , t .Name (), err )
173157 }
174158 if ! use {
175159 continue
176160 }
177161 runner , err := initRunner (t , dir , passInEnv )
178162 if err != nil {
179- return nil , errors . Wrapf ( err , "initializing %s runner" , t .Name ())
163+ return nil , fmt . Errorf ( "initializing %s runner: %w " , t .Name (), err )
180164 }
181165 runners = append (runners , runner )
182166 }
@@ -192,7 +176,7 @@ func NewIntegrationRunners(path string, passInEnv map[string]string) (Integratio
192176 }
193177 runner , err := initRunner (tester , dir , passInEnv )
194178 if err != nil {
195- return nil , errors . Wrapf ( err , "initializing docker runner" )
179+ return nil , fmt . Errorf ( "initializing docker runner: %w" , err )
196180 }
197181 runners = append (runners , runner )
198182 }
@@ -243,38 +227,33 @@ func initRunner(tester IntegrationTester, dir string, passInEnv map[string]strin
243227}
244228
245229// Test actually performs the test.
246- func (r * IntegrationRunner ) Test (mageTarget string , test func () error ) ( err error ) {
230+ func (r * IntegrationRunner ) Test (mageTarget string , test func () error ) error {
247231 // Inside the testing environment just run the test.
248232 if IsInIntegTestEnv () {
249- err = r .tester .InsideTest (test )
250- return
233+ return r .tester .InsideTest (test )
251234 }
252235
253236 // Honor the TEST_ENVIRONMENT value if set.
254237 if testEnvVar , isSet := os .LookupEnv ("TEST_ENVIRONMENT" ); isSet {
255- var enabled bool
256- enabled , err = strconv .ParseBool (testEnvVar )
238+ enabled , err := strconv .ParseBool (testEnvVar )
257239 if err != nil {
258- err = errors .Wrap (err , "failed to parse TEST_ENVIRONMENT value" )
259- return
240+ return fmt .Errorf ("failed to parse TEST_ENVIRONMENT value: %w" , err )
260241 }
261242 if ! enabled {
262- err = fmt .Errorf ("TEST_ENVIRONMENT=%s" , testEnvVar )
263- return
243+ return fmt .Errorf ("TEST_ENVIRONMENT=%s" , testEnvVar )
264244 }
265245 }
266246
267247 // log missing requirements and do nothing
268- err = r .tester .HasRequirements ()
248+ err : =r .tester .HasRequirements ()
269249 if err != nil {
270- // log error; and return (otherwise on machines without requirements it will mark the tests as failed)
271250 fmt .Printf ("skipping test run with %s due to missing requirements: %s\n " , r .tester .Name (), err )
272- err = nil
273- return
251+ //nolint:nilerr // log error; and return (otherwise on machines without requirements it will mark the tests as failed)
252+ return nil
274253 }
275254
276- if err = r .steps .Setup (r .env ); err != nil {
277- return
255+ if err : =r .steps .Setup (r .env ); err != nil {
256+ return err
278257 }
279258
280259 // catch any panics to run teardown
@@ -306,18 +285,18 @@ func (r *IntegrationRunner) Test(mageTarget string, test func() error) (err erro
306285 err = teardownErr
307286 }
308287 }
309- return
288+ return err
310289}
311290
312291// Test runs the test on each runner and collects the errors.
313292func (r IntegrationRunners ) Test (mageTarget string , test func () error ) error {
314- var errs multierror. Errors
293+ var errs [] error
315294 for _ , runner := range r {
316295 if err := runner .Test (mageTarget , test ); err != nil {
317296 errs = append (errs , err )
318297 }
319298 }
320- return errs . Err ( )
299+ return errors . Join ( errs ... )
321300}
322301
323302func passThroughEnvs (env map [string ]string , passthrough ... string ) {
0 commit comments