Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

testing: send t.signal only if there is no panic

Browse source 
If a signal is sent to t.signal before the panic is triggered,
a panicking test may end up with "warning: no tests to run" because
the tRunner that invokes the test in t.Run calls runtime.Goexit on
panic, which causes the panicking test not be recorded in runTests.

Send the signal if and only if there is no panic.

Fixes #41479

Change-Id: I812f1303bfe02c443a1902732e68d21620d6672e
Reviewed-on: https://go-review.googlesource.com/c/go/+/256098
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com>
Trust: Emmanuel Odeke <emm.odeke@gmail.com>
Trust: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
Changkun Ou 2020-09-19 23:32:12 +02:00 • committed by Emmanuel Odeke
parent 428509402b
commit 4cba6c703f
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cmd/go/testdata/script/test_cleanup_failnow.txt vendored
View file

@ -1,11 +1,25 @@
# For issue 41355 # For issue 41355
[short] skip [short] skip
# This test could fail if the testing package does not wait until
# a panicking test does the panic. Turn off multithreading, GC, and
# async preemption to increase the probability of such a failure.
env GOMAXPROCS=1
env GOGC=off
env GODEBUG=asyncpreempt=off
# If the test exits with 'no tests to run', it means the testing package
# implementation is incorrect and does not wait until a test panic.
# If the test exits with '(?s)panic: die.*panic: die', it means
# the testing package did an extra panic for a panicking test.
! go test -v cleanup_failnow/panic_nocleanup_test.go ! go test -v cleanup_failnow/panic_nocleanup_test.go
! stdout 'no tests to run'
stdout '(?s)panic: die \[recovered\].*panic: die' stdout '(?s)panic: die \[recovered\].*panic: die'
! stdout '(?s)panic: die \[recovered\].*panic: die.*panic: die' ! stdout '(?s)panic: die \[recovered\].*panic: die.*panic: die'
! go test -v cleanup_failnow/panic_withcleanup_test.go ! go test -v cleanup_failnow/panic_withcleanup_test.go
! stdout 'no tests to run'
stdout '(?s)panic: die \[recovered\].*panic: die' stdout '(?s)panic: die \[recovered\].*panic: die'
! stdout '(?s)panic: die \[recovered\].*panic: die.*panic: die' ! stdout '(?s)panic: die \[recovered\].*panic: die.*panic: die'

10
src/testing/testing.go
View file

@ -1091,10 +1091,16 @@ func tRunner(t *T, fn func(t *T)) {
// complete even if a cleanup function calls t.FailNow. See issue 41355. // complete even if a cleanup function calls t.FailNow. See issue 41355.
didPanic := false didPanic := false
defer func() { defer func() {
t.signal <- signal if didPanic {
if err != nil && !didPanic { return
}
if err != nil {
panic(err) panic(err)
} }
// Only report that the test is complete if it doesn't panic,
// as otherwise the test binary can exit before the panic is
// reported to the user. See issue 41479.
t.signal <- signal
}() }()
doPanic := func(err interface{}) { doPanic := func(err interface{}) {