Merge pull request #124542 from cockroachdb/blathers/backport-release…

…-24.1-124219 release-24.1: log: fix race in TestLogEntryPropagation
cockroachdb · May 22, 2024 · 67de82c · 67de82c
2 parents f7e67e4 + 1d5a349
commit 67de82c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/util/log/clog_test.go b/pkg/util/log/clog_test.go
@@ -749,8 +749,8 @@ func TestLogEntryPropagation(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer func() { _ = f.Close() }()
-	defer func(prevStderr *os.File) { OrigStderr = prevStderr }(OrigStderr)
-	OrigStderr = f
+	require.NoError(t, hijackStderr(f))
+	defer func() { require.NoError(t, hijackStderr(OrigStderr)) }()
 
 	const specialMessage = `CAPTAIN KIRK`