Skip to content

tests: fix stopping race in http client harness #6566

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
algorandskiy merged 2 commits into from
Feb 25, 2026
Merged

tests: fix stopping race in http client harness #6566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d97b9c7
tests: fix stopping race in http client harness
algorandskiy Feb 24, 2026
b8f7fa7
CR: fix error condition
algorandskiy Feb 24, 2026
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
4 changes: 3 additions & 1 deletion network/p2p/testing/httpNode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ func (p *HTTPNode) RegisterHandlers(dispatch []network.TaggedMessageHandler) {}
func (p *HTTPNode) Start() error {
go func() {
err := p.httpServer.Serve()
require.NoError(p.tb, err)
if err != nil {
require.ErrorIs(p.tb, err, http.ErrServerClosed)
}
}()
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions network/p2pNetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,9 +593,9 @@ func (n *P2PNetwork) httpdThread() {
defer n.wg.Done()

err := n.httpServer.Serve()
if err != nil {
if err == http.ErrServerClosed {
} else if err != nil {
n.log.Errorf("Error serving libp2phttp: %v", err)
return
}
}

Expand Down
Loading