]> Cypherpunks repositories - gostls13.git/commitdiff
all: fix invalid invocations of Fatalf in goroutines
authorEmmanuel T Odeke <emmanuel@orijtech.com>
Thu, 2 Jan 2020 10:00:55 +0000 (02:00 -0800)
committerEmmanuel Odeke <emm.odeke@gmail.com>
Fri, 3 Jan 2020 01:36:26 +0000 (01:36 +0000)
Found by running the go vet pass 'testinggoroutine' that
I started in CL 212920.

Change-Id: Ic9462fac85dbafc437fe4a323b886755a67a1efa
Reviewed-on: https://go-review.googlesource.com/c/go/+/213097
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/database/sql/sql_test.go
src/net/lookup_test.go
src/time/sleep_test.go

index ed0099e0e94bf4e6358dfa9cedeaea567b4e7b57..6f59260cdab57335e1dc21ab4541bf4cada65315 100644 (file)
@@ -629,7 +629,8 @@ func TestPoolExhaustOnCancel(t *testing.T) {
                go func() {
                        rows, err := db.Query("SELECT|people|name,photo|")
                        if err != nil {
-                               t.Fatalf("Query: %v", err)
+                               t.Errorf("Query: %v", err)
+                               return
                        }
                        rows.Close()
                        saturateDone.Done()
@@ -637,6 +638,9 @@ func TestPoolExhaustOnCancel(t *testing.T) {
        }
 
        saturate.Wait()
+       if t.Failed() {
+               t.FailNow()
+       }
        state = 2
 
        // Now cancel the request while it is waiting.
index 8a41510daf3ece4d5184482f79554ce9c7ad6670..1663b78ef00d05f07b7ed4fe3663b66f35aacdf3 100644 (file)
@@ -998,12 +998,16 @@ func TestConcurrentPreferGoResolversDial(t *testing.T) {
                        defer wg.Done()
                        _, err := r.LookupIPAddr(context.Background(), "google.com")
                        if err != nil {
-                               t.Fatalf("lookup failed for resolver %d: %q", index, err)
+                               t.Errorf("lookup failed for resolver %d: %q", index, err)
                        }
                }(resolver.Resolver, i)
        }
        wg.Wait()
 
+       if t.Failed() {
+               t.FailNow()
+       }
+
        for i, resolver := range resolvers {
                if !resolver.dialed {
                        t.Errorf("custom resolver %d not dialed during lookup", i)
index 950e0eabe1db3ba85ae172c9fa4d562285b4ad79..f5678020b9a04fea94c921846568ea8cb26ccfd1 100644 (file)
@@ -356,7 +356,7 @@ func TestTimerStopStress(t *testing.T) {
        for i := 0; i < 100; i++ {
                go func(i int) {
                        timer := AfterFunc(2*Second, func() {
-                               t.Fatalf("timer %d was not stopped", i)
+                               t.Errorf("timer %d was not stopped", i)
                        })
                        Sleep(1 * Second)
                        timer.Stop()