fix typos and race cond for changed logic

Author: Uwe Jugel

assert/assertions.go

@@ -13,6 +13,7 @@ import (
 	"runtime"
 	"runtime/debug"
 	"strings"
+	"sync/atomic"
 	"time"
 	"unicode"
 	"unicode/utf8"
@@ -2151,21 +2152,27 @@ func EventuallyWithT(t TestingT, condition func(collect *CollectT), waitFor time
 		conditionSucceeded
 	)
 
-	var lastFinishedTickErrs []error
+	var lastFinishedTickErrs atomic.Value // of []error
 	ch := make(chan int, 1)
 
 	checkCond := func() {
 		result := conditionExitedUnexpectedly
 		collect := new(CollectT)
 		defer func() {
+			// At this point, the condition has returned or exited. It is safe
+			// to check collect.errors and collect.exited, unless the user has
+			// created additional goroutines that access 'collect', which would
+			// be a misuse and is not supported.
 			if collect.exited {
 				// Condition exited via [CollectT.FailNow], which is a regular
 				// way to fail the condition early and exit the goroutine.
 				result = conditionFailed
 			}
 			// Keep the collected tick errors, so that they can be copied to 't'
 			// when timeout is reached or there is an unexpected exit.
-			lastFinishedTickErrs = collect.errors
+			// Always store the actual value of collect.errors, even if nil
+			lastFinishedTickErrs.Store(collect.errors)
+
 			ch <- result
 		}()
 		condition(collect)
@@ -2176,6 +2183,16 @@ func EventuallyWithT(t TestingT, condition func(collect *CollectT), waitFor time
 		}
 	}
 
+	copyLastFinishedTickErrs := func() {
+		errs, ok := lastFinishedTickErrs.Load().([]error)
+		if !ok {
+			return
+		}
+		for _, err := range errs {
+			t.Errorf("%v", err)
+		}
+	}
+
 	timer := time.NewTimer(waitFor)
 	defer timer.Stop()
 
@@ -2190,19 +2207,15 @@ func EventuallyWithT(t TestingT, condition func(collect *CollectT), waitFor time
 	for {
 		select {
 		case <-timer.C:
-			for _, err := range lastFinishedTickErrs {
-				t.Errorf("%v", err)
-			}
+			copyLastFinishedTickErrs()
 			return Fail(t, "Condition never satisfied", msgAndArgs...)
 		case <-tickC:
 			tickC = nil
 			go checkCond()
 		case result := <-ch:
 			switch result {
 			case conditionExitedUnexpectedly:
-				for _, err := range lastFinishedTickErrs {
-					t.Errorf("%v", err)
-				}
+				copyLastFinishedTickErrs()
 				return Fail(t, "Condition exited unexpectedly", msgAndArgs...)
 			case conditionSucceeded:
 				return true

require/requirements_test.go

@@ -803,6 +803,6 @@ func TestEventuallyWithTOuterFailNow(t *testing.T) {
 	}
 
 	EventuallyWithT(mockT, condition, 100*time.Millisecond, 20*time.Millisecond)
-	True(t, mockT.Failed, "Check should pass")
-	Equal(t, 1, counter, "Condition is expected to be called 1 times")
+	True(t, mockT.Failed, "Check should fail")
+	Equal(t, 1, counter, "Condition is expected to be called once")
 }