Fix a couple race conditions

Found with -race
gotestyourself · Oct 25, 2020 · 485b2ea · 485b2ea
1 parent 8f9d58b
commit 485b2ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/testjson/execution.go b/testjson/execution.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"sort"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/jonboulle/clockwork"
@@ -261,11 +262,12 @@ func newPackage() *Package {
 
 // Execution of one or more test packages
 type Execution struct {
-	started   time.Time
-	packages  map[string]*Package
-	errors    []string
-	done      bool
-	lastRunID int
+	started    time.Time
+	packages   map[string]*Package
+	errorsLock sync.RWMutex
+	errors     []string
+	done       bool
+	lastRunID  int
 }
 
 func (e *Execution) add(event TestEvent) {
@@ -462,11 +464,15 @@ func (e *Execution) addError(err string) {
 	if strings.HasPrefix(err, "# ") {
 		return
 	}
+	e.errorsLock.Lock()
 	e.errors = append(e.errors, err)
+	e.errorsLock.Unlock()
 }
 
 // Errors returns a list of all the errors.
 func (e *Execution) Errors() []string {
+	e.errorsLock.RLock()
+	defer e.errorsLock.RUnlock()
 	return e.errors
 }
 

diff --git a/testjson/format_test.go b/testjson/format_test.go
@@ -118,6 +118,7 @@ var expectedExecution = &Execution{
 var cmpExecutionShallow = gocmp.Options{
 	gocmp.AllowUnexported(Execution{}, Package{}),
 	gocmp.FilterPath(stringPath("started"), opt.TimeWithThreshold(10*time.Second)),
+	cmpopts.IgnoreFields(Execution{}, "errorsLock"),
 	cmpopts.EquateEmpty(),
 	cmpPackageShallow,
 }

diff --git a/testjson/summary.go b/testjson/summary.go
@@ -150,7 +150,7 @@ type executionSummary interface {
 }
 
 type noOutputSummary struct {
-	Execution
+	*Execution
 }
 
 func (s *noOutputSummary) OutputLines(_ TestCase) []string {
@@ -161,7 +161,7 @@ func newExecSummary(execution *Execution, opts Summary) executionSummary {
 	if opts.Includes(SummarizeOutput) {
 		return execution
 	}
-	return &noOutputSummary{Execution: *execution}
+	return &noOutputSummary{Execution: execution}
 }
 
 func writeTestCaseSummary(out io.Writer, execution executionSummary, conf testCaseFormatConfig) {