Skip to content

test(aws/ladder): distinguish pre-write aborts during loopback fixture cleanup #500

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
cristim merged 1 commit into from
Oct 17, 2026
Merged

test(aws/ladder): distinguish pre-write aborts during loopback fixture cleanup #500

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 providers/aws/ladder/ce_loopback_body_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func ceAwait(done, abort <-chan struct{}) error {
type ceSchedule struct {
abort, entered, sdkClosed, wrote, connClosed chan struct{}
enterOnce, sdkOnce, writeOnce, connOnce sync.Once
returned atomic.Bool
returned, dialed, handlerStarted atomic.Bool
copyErr, writeErr error
status int
}
Expand Down Expand Up @@ -294,6 +294,7 @@ func TestCELoopbackPublicBaselineAfterBodyClose(t *testing.T) {
var baseline ladder.UsageBaseline
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
defer close(handlerDone)
s.handlerStarted.Store(true)
var input costexplorer.GetCostAndUsageInput
handlerErr = json.NewDecoder(req.Body).Decode(&input)
if handlerErr != nil {
Expand All @@ -318,12 +319,22 @@ func TestCELoopbackPublicBaselineAfterBodyClose(t *testing.T) {
if err != nil {
return conn, err
}
s.dialed.Store(true)
return &ceScheduledConn{TCPConn: conn.(*net.TCPConn), s: s}, nil
}
cleanup := sync.OnceFunc(func() {
cancel()
close(s.abort)
opJoin, handlerJoin, writeJoin := ceAwait(done, nil), ceAwait(handlerDone, nil), ceAwait(s.wrote, nil)
opJoin := ceAwait(done, nil)
var handlerJoin, writeJoin error
if s.handlerStarted.Load() {
handlerJoin = ceAwait(handlerDone, nil)
}
if s.dialed.Load() {
writeJoin = ceAwait(s.wrote, nil)
} else {
t.Log("request aborted before any connection was dialed; skipping write and handler joins")
}
if handlerJoin == nil {
srv.Close()
} else {
Expand Down
Loading