Test that execution stops if ScanTestOutput errors

testjson/execution.go

@@ -562,18 +562,10 @@ func ScanTestOutput(config ScanConfig) (*Execution, error) {
 
 	var group errgroup.Group
 	group.Go(func() error {
-		if err := readStdout(config, execution); err != nil {
-			config.Stop()
-			return err
-		}
-		return nil
+		return stopOnError(config.Stop, readStdout(config, execution))
 	})
 	group.Go(func() error {
-		if err := readStderr(config, execution); err != nil {
-			config.Stop()
-			return err
-		}
-		return nil
+		return stopOnError(config.Stop, readStderr(config, execution))
 	})
 
 	err := group.Wait()
@@ -585,6 +577,14 @@ func ScanTestOutput(config ScanConfig) (*Execution, error) {
 	return execution, err
 }
 
+func stopOnError(stop func(), err error) error {
+	if err != nil {
+		stop()
+		return err
+	}
+	return nil
+}
+
 func readStdout(config ScanConfig, execution *Execution) error {
 	scanner := bufio.NewScanner(config.Stdout)
 	for scanner.Scan() {

testjson/execution_test.go

@@ -2,6 +2,7 @@ package testjson
 
 import (
 	"bytes"
+	"fmt"
 	"testing"
 	"time"
 
@@ -58,3 +59,34 @@ func TestScanTestOutput_MinimalConfig(t *testing.T) {
 	// a weak check to show that all the stdout was scanned
 	assert.Equal(t, exec.Total(), 46)
 }
+
+func TestScanTestOutput_CallsStopOnError(t *testing.T) {
+	var called bool
+	stop := func() {
+		called = true
+	}
+	cfg := ScanConfig{
+		Stdout:  bytes.NewReader(golden.Get(t, "go-test-json.out")),
+		Handler: &handlerFails{},
+		Stop:    stop,
+	}
+	_, err := ScanTestOutput(cfg)
+	assert.Error(t, err, "something failed")
+	assert.Assert(t, called)
+}
+
+type handlerFails struct {
+	count int
+}
+
+func (s *handlerFails) Event(_ TestEvent, _ *Execution) error {
+	if s.count > 1 {
+		return fmt.Errorf("something failed")
+	}
+	s.count++
+	return nil
+}
+
+func (s *handlerFails) Err(_ string) error {
+	return nil
+}