testing, testing/synctest: handle T.Helper in synctest bubbles

Fixes #74199

Change-Id: I6a15fbd59a3a3f8c496440f56d09d695e1504e4e
Reviewed-on: https://go-review.googlesource.com/c/go/+/682576
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Alan Donovan <adonovan@google.com>
Auto-Submit: Damien Neil <dneil@google.com>
This commit is contained in:
Damien Neil 2025-06-20 14:44:09 +01:00 committed by Gopher Robot
parent 3bf1eecbd3
commit 49cdf0c42e
3 changed files with 30 additions and 0 deletions

View file

@ -0,0 +1,15 @@
// Copyright 2025 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package synctest_test
import "testing"
// helperLog is a t.Helper which logs.
// Since it is a helper, the log prefix should contain
// the caller's file, not helper_test.go.
func helperLog(t *testing.T, s string) {
t.Helper()
t.Log(s)
}

View file

@ -140,6 +140,18 @@ func TestRun(t *testing.T) {
}) })
} }
func TestHelper(t *testing.T) {
runTest(t, []string{"-test.v"}, func() {
synctest.Test(t, func(t *testing.T) {
helperLog(t, "log in helper")
})
}, `^=== RUN TestHelper
synctest_test.go:.* log in helper
--- PASS: TestHelper.*
PASS
$`)
}
func wantPanic(t *testing.T, want string) { func wantPanic(t *testing.T, want string) {
if e := recover(); e != nil { if e := recover(); e != nil {
if got := fmt.Sprint(e); got != want { if got := fmt.Sprint(e); got != want {

View file

@ -1261,6 +1261,9 @@ func (c *common) Skipped() bool {
// When printing file and line information, that function will be skipped. // When printing file and line information, that function will be skipped.
// Helper may be called simultaneously from multiple goroutines. // Helper may be called simultaneously from multiple goroutines.
func (c *common) Helper() { func (c *common) Helper() {
if c.isSynctest {
c = c.parent
}
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
if c.helperPCs == nil { if c.helperPCs == nil {