forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-05 14:38:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rpc: accept Windows reset error in websocket read limit test (#34928)

Browse source 
### Summary

`TestServerWebsocketReadLimit/limit_with_large_request_-_should_fail` is
flaky on `windows/amd64` (see [run
25364841576](https://github.com/ethereum/go-ethereum/actions/runs/25364841576/job/74378334589)
referenced in #34877):

```
--- FAIL: TestServerWebsocketReadLimit/limit_with_large_request_-_should_fail (0.02s)
    server_test.go:279: unexpected error for read limit violation: read tcp 127.0.0.1:56703->127.0.0.1:56700:
        wsarecv: An existing connection was forcibly closed by the remote host.
```

When the server enforces the read limit and tears the connection down,
the client's read can race the close frame. On Windows the OS surfaces
that race as `wsarecv: An existing connection was forcibly closed by the
remote host` instead of the gorilla `CloseError(1009)`,
`websocket.ErrReadLimit`, or the POSIX `connection reset by peer` the
test already tolerates.

This change adds `"forcibly closed"` to the set of acceptable error
substrings for the failure case, so the Windows reset is recognized as a
valid signal that the server enforced the limit.

### Fixes

#34877

### Test plan

- [x] `go test -count=5 -run TestServerWebsocketReadLimit ./rpc/`
(darwin/arm64) — pass
- [x] `go test ./rpc/...` — pass
- [x] `go vet ./rpc/...` / `gofmt -l rpc/server_test.go` — clean
- [ ] CI on `windows/amd64` confirms the flake no longer trips

---------

Co-authored-by: lightclient <lightclient@protonmail.com>
This commit is contained in:
ozpool 2026-06-04 22:27:11 +05:30 committed by GitHub
parent 7835a71dae
commit dcf6d0c135
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rpc/server_test.go
View file

@ -307,7 +307,7 @@ func TestServerWebsocketReadLimit(t *testing.T) {
t.Fatalf("expected error for request size %d with limit %d, but got none", tc.testSize, tc.readLimit) t.Fatalf("expected error for request size %d with limit %d, but got none", tc.testSize, tc.readLimit)
} }
// Be tolerant about the exact error surfaced by gorilla/websocket. // Be tolerant about the exact error surfaced by gorilla/websocket.
// Prefer a CloseError with code 1009, but accept ErrReadLimit or an error string containing 1009/message too big. // The error text can vary across platforms when the close races the read.
var cerr *websocket.CloseError var cerr *websocket.CloseError
if errors.As(err, &cerr) { if errors.As(err, &cerr) {
if cerr.Code != websocket.CloseMessageTooBig { if cerr.Code != websocket.CloseMessageTooBig {
@ -316,7 +316,8 @@ func TestServerWebsocketReadLimit(t *testing.T) {
} else if !errors.Is(err, websocket.ErrReadLimit) && } else if !errors.Is(err, websocket.ErrReadLimit) &&
!strings.Contains(strings.ToLower(err.Error()), "1009") && !strings.Contains(strings.ToLower(err.Error()), "1009") &&
!strings.Contains(strings.ToLower(err.Error()), "message too big") && !strings.Contains(strings.ToLower(err.Error()), "message too big") &&
!strings.Contains(strings.ToLower(err.Error()), "connection reset by peer") { !strings.Contains(strings.ToLower(err.Error()), "connection reset by peer") &&
!strings.Contains(strings.ToLower(err.Error()), "forcibly closed") {
// Not the error we expect from exceeding the message size limit. // Not the error we expect from exceeding the message size limit.
t.Fatalf("unexpected error for read limit violation: %v", err) t.Fatalf("unexpected error for read limit violation: %v", err)
} }