From a2766ffe0c25d924083e7aea7f9c834c09c6468e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 26 Nov 2017 18:42:44 +0100 Subject: [PATCH] CI: return directly after an error occurred --- run_integration_tests.go | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/run_integration_tests.go b/run_integration_tests.go index 3782353ab..9010d4b1b 100644 --- a/run_integration_tests.go +++ b/run_integration_tests.go @@ -484,16 +484,21 @@ func main() { os.Exit(1) } - foundError := false - for _, f := range []func() error{env.Prepare, env.RunTests, env.Teardown} { - err := f() - if err != nil { - foundError = true - fmt.Fprintf(os.Stderr, "error: %v\n", err) - } - } - - if foundError { + err := env.Prepare() + if err != nil { + fmt.Fprintf(os.Stderr, "error preparing: %v\n", err) os.Exit(1) } + + err = env.RunTests() + if err != nil { + fmt.Fprintf(os.Stderr, "error running tests: %v\n", err) + os.Exit(2) + } + + err = env.Teardown() + if err != nil { + fmt.Fprintf(os.Stderr, "error during teardown: %v\n", err) + os.Exit(3) + } }