Skip to content

Fix concurrent writes to stdout in tests. #2350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Fix concurrent writes to stdout in tests. #2350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d7730f2
Fix concurant writes to stdout from deps.
trulede Aug 3, 2025
7adcf53
Fix linter items.
trulede Aug 4, 2025
6546505
Revert previous change, use SyncBuffer, add tests.
trulede Aug 8, 2025
22a414d
Fix linter message.
trulede Aug 8, 2025
71f0c24
Turn off buffering for stdout in test shell scripts.
trulede Aug 9, 2025
28adfd3
Disable output test on darwin.
trulede Aug 9, 2025
27a806e
Fix issue #1208
trulede Aug 9, 2025
050d877
Improve test bash script behavior.
trulede Aug 9, 2025
d7bba04
Update task.go
trulede Aug 10, 2025
985e1ba
Remove new output tests.
trulede Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@ func (tt *ExecutorTest) run(t *testing.T) {
t.Helper()
f := func(t *testing.T) {
t.Helper()
var buf bytes.Buffer
var buffer SyncBuffer

opts := append(
tt.executorOpts,
task.WithStdout(&buf),
task.WithStderr(&buf),
task.WithStdout(&buffer),
task.WithStderr(&buffer),
)

// If the test has input, create a reader for it and add it to the
Expand All @@ -172,7 +172,7 @@ func (tt *ExecutorTest) run(t *testing.T) {
if err := e.Setup(); tt.wantSetupError {
require.Error(t, err)
tt.writeFixtureErrSetup(t, g, err)
tt.writeFixtureBuffer(t, g, buf)
tt.writeFixtureBuffer(t, g, buffer.buf)
return
} else {
require.NoError(t, err)
Expand All @@ -193,7 +193,7 @@ func (tt *ExecutorTest) run(t *testing.T) {
if err := e.Run(ctx, call); tt.wantRunError {
require.Error(t, err)
tt.writeFixtureErrRun(t, g, err)
tt.writeFixtureBuffer(t, g, buf)
tt.writeFixtureBuffer(t, g, buffer.buf)
return
} else {
require.NoError(t, err)
Expand All @@ -206,7 +206,7 @@ func (tt *ExecutorTest) run(t *testing.T) {
}
}

tt.writeFixtureBuffer(t, g, buf)
tt.writeFixtureBuffer(t, g, buffer.buf)
}

// Run the test (with a name if it has one)
Expand Down
9 changes: 7 additions & 2 deletions internal/output/group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,15 @@ func (gw *groupWriter) close() error {
// don't print begin/end messages if there's no buffered entries
return nil
}
if _, err := io.WriteString(gw.writer, gw.begin); err != nil {
return err
if len(gw.begin) > 0 {
// Rewrite the gw.buff with the beginning text.
s := gw.buff.String()
gw.buff.Reset()
gw.buff.WriteString(gw.begin)
gw.buff.WriteString(s)
}
gw.buff.WriteString(gw.end)
// Return the entire gw.buff to ensure the group is written atomically to stdout.
_, err := io.Copy(gw.writer, &gw.buff)
return err
}
Loading