From a650e399dfc2435eb18efc430a70cba9d87cec73 Mon Sep 17 00:00:00 2001
From: Changkun Ou <hi@changkun.de>
Date: Mon, 27 Sep 2021 12:06:43 +0200
Subject: testing: fix error message when a parallel Cleanup calls
 runtime.Goexit

Fixes #48502

Change-Id: I6054b043ebd2237e19897fdf1234b311d19facc7
Reviewed-on: https://go-review.googlesource.com/c/go/+/352350
Reviewed-by: Joedian Reid <joedian@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Changkun Ou <mail@changkun.de>
Reviewed-by: Bryan Mills <bcmills@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
---
 src/testing/testing.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/testing/testing.go')

diff --git a/src/testing/testing.go b/src/testing/testing.go
index b2a65e95d3..8d3129fbcd 100644
--- a/src/testing/testing.go
+++ b/src/testing/testing.go
@@ -1462,8 +1462,10 @@ func tRunner(t *T, fn func(t *T)) {
 				finished = p.finished
 				p.mu.RUnlock()
 				if finished {
-					t.Errorf("%v: subtest may have called FailNow on a parent test", err)
-					err = nil
+					if !t.isParallel {
+						t.Errorf("%v: subtest may have called FailNow on a parent test", err)
+						err = nil
+					}
 					signal = false
 					break
 				}
-- 
cgit v1.3-5-g9baa