Skip to content

gcs: fix flaky test on bridge teardown race #2744

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

Merged
shreyanshjain7174 merged 1 commit into from
May 19, 2026
+13 −2
Merged

gcs: fix flaky test on bridge teardown race #2744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions internal/gcs/guestconnection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ func simpleGcsLoop(t *testing.T, rw io.ReadWriter) error {
for {
id, typ, b, err := readMessage(rw)
if err != nil {
if errors.Is(err, io.EOF) || errors.Is(err, io.ErrClosedPipe) {
// EOF, ErrClosedPipe, and ErrUnexpectedEOF can all surface when
// the test's bridge closes the pipe mid-message during teardown.
// Treat them all as a clean shutdown of the fake guest.
if errors.Is(err, io.EOF) || errors.Is(err, io.ErrClosedPipe) || errors.Is(err, io.ErrUnexpectedEOF) {
err = nil
}
return err
Expand Down Expand Up @@ -154,7 +157,15 @@ func connectGcs(ctx context.Context, t *testing.T) *GuestConnection {
c.Close()
}()
}
go simpleGcs(t, c)
// Join the fake-guest goroutine before the test returns so that any
// t.Error it makes during teardown lands inside the test scope, instead
// of panicking the runtime ("Fail in goroutine after Test... completed").
done := make(chan struct{})
go func() {
defer close(done)
simpleGcs(t, c)
}()
t.Cleanup(func() { <-done })
gcc := &GuestConnectionConfig{
Conn: s,
Log: logrus.NewEntry(logrus.StandardLogger()),
Expand Down