Exit rerun if exit status > 1

main.go

@@ -210,9 +210,13 @@ func run(opts *options) error {
 		return err
 	}
 	goTestExitErr := goTestProc.cmd.Wait()
+
 	if goTestExitErr != nil && opts.rerunFailsMaxAttempts > 0 {
-		cfg := testjson.ScanConfig{Execution: exec, Handler: handler}
-		goTestExitErr = rerunFailed(ctx, opts, cfg)
+		goTestExitErr = hasErrors(goTestExitErr, exec)
+		if goTestExitErr == nil {
+			cfg := testjson.ScanConfig{Execution: exec, Handler: handler}
+			goTestExitErr = rerunFailed(ctx, opts, cfg)
+		}
 	}
 
 	testjson.PrintSummary(opts.stdout, exec, opts.noSummary.value)

rerunfails.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"gotest.tools/gotestsum/log"
 	"gotest.tools/gotestsum/testjson"
 )
 
@@ -33,9 +32,6 @@ func rerunFailed(ctx context.Context, opts *options, scanConfig testjson.ScanCon
 			"number of test failures (%d) exceeds maximum (%d) set by --rerun-fails-max-failures",
 			failed, opts.rerunFailsMaxInitialFailures)
 	}
-	if err := hasErrors(scanConfig.Execution); err != nil {
-		return err
-	}
 
 	rec := newFailureRecorderFromExecution(scanConfig.Execution)
 	var lastErr error
@@ -64,12 +60,7 @@ func rerunFailed(ctx context.Context, opts *options, scanConfig testjson.ScanCon
 				return err
 			}
 			lastErr = goTestProc.cmd.Wait()
-			// 0 and 1 are expected.
-			if ExitCodeWithDefault(lastErr) > 1 {
-				log.Warnf("unexpected go test exit code: %v", lastErr)
-				// TODO: will 'go test' exit with 2 if it panics? maybe return err here.
-			}
-			if err := hasErrors(scanConfig.Execution); err != nil {
+			if err := hasErrors(lastErr, scanConfig.Execution); err != nil {
 				return err
 			}
 			rec = nextRec
@@ -78,11 +69,16 @@ func rerunFailed(ctx context.Context, opts *options, scanConfig testjson.ScanCon
 	return lastErr
 }
 
-func hasErrors(exec *testjson.Execution) error {
-	if len(exec.Errors()) > 0 {
+func hasErrors(err error, exec *testjson.Execution) error {
+	switch {
+	case len(exec.Errors()) > 0:
 		return fmt.Errorf("rerun aborted because previous run had errors")
+	// Exit code 0 and 1 are expected.
+	case ExitCodeWithDefault(err) > 1:
+		return fmt.Errorf("unexpected go test exit code: %v", err)
+	default:
+		return nil
 	}
-	return nil
 }
 
 type failureRecorder struct {