From 555d425d177db7fa7123779d253aee42980cb8a3 Mon Sep 17 00:00:00 2001 From: Damien Neil Date: Wed, 28 May 2025 10:55:26 -0700 Subject: testing, testing/synctest: write bubble errors to parent test log Ensure that log messages written to the testing.T created by synctest.Test appear in the test output when a test fails. Fixes #73902 Change-Id: Ie97f5efe54eb003e6c0a5394c2def4cac1520ecb Reviewed-on: https://go-review.googlesource.com/c/go/+/676995 Reviewed-by: Alan Donovan Auto-Submit: Damien Neil LUCI-TryBot-Result: Go LUCI --- src/testing/testing.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/testing/testing.go') diff --git a/src/testing/testing.go b/src/testing/testing.go index 85ac1aeb32..43ef9eef09 100644 --- a/src/testing/testing.go +++ b/src/testing/testing.go @@ -1045,7 +1045,7 @@ func (c *common) destination() *common { c.mu.Lock() defer c.mu.Unlock() - if !c.done { + if !c.done && !c.isSynctest { return c } for parent := c.parent; parent != nil; parent = parent.parent { @@ -2037,7 +2037,6 @@ func testingSynctestTest(t *T, f func(*T)) { }, tstate: t.tstate, } - t2.setOutputWriter() go tRunner(t2, f) if !<-t2.signal { -- cgit v1.3