From 3c6b0d519f1d3cab03d9a972271fc0ef42a420d5 Mon Sep 17 00:00:00 2001 From: clawbot <35+clawbot@noreply.example.org> Date: Mon, 16 Nov 2026 08:58:18 +0100 Subject: [PATCH] rproxy: breaker test no longer needs each failed ask to reach waf (closes #398) TestFiveFailedAsksKeepTheNextRequestFromAskingWAF waited for a question from each of the five failing asks. Under load an ask could time out before the stand-in for waf saw it, and the test failed with "no question". It now waits only for each visitor's answer. Before the sixth request, it checks that rproxy has not written that the circuit breaker is open, so none of the first five was kept from asking waf. It checks that the sixth request did not ask by its request ID, which the app records, so late questions from the failed asks cannot be mistaken for it. Model: opus-5-5 --- internal/rproxy/rproxy_test.go | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/internal/rproxy/rproxy_test.go b/internal/rproxy/rproxy_test.go index 7396921..d45e5f6 100644 --- a/internal/rproxy/rproxy_test.go +++ b/internal/rproxy/rproxy_test.go @@ -1424,7 +1424,14 @@ func TestFiveFailedAsksKeepTheNextRequestFromAskingWAF(t *testing.T) { failure(w, r) }, ) - app := startApp(t, greet) + nextID := make(chan string, 1) + app := startApp(t, func(w http.ResponseWriter, r *http.Request) { + if answering.Load() { + nextID <- r.Header.Get(requestIDHeader) + } + + greet(w, r) + }) addr, out := startRProxy( t, standIn.URL, @@ -1434,19 +1441,36 @@ func TestFiveFailedAsksKeepTheNextRequestFromAskingWAF(t *testing.T) { }, ) + // An ask can time out before it reaches the stand-in, so these + // may leave fewer than five questions, or leave some late. for range 5 { wantGreeting(t, get(t, addr, "/")) - standIn.question(t) + } + + // rproxy writes this line before it answers a request it kept + // from asking waf, so no wait is needed. + if out.has("the circuit breaker is open") { + t.Error("the circuit breaker opened before five asks failed") } answering.Store(true) wantGreeting(t, get(t, addr, "/")) out.waitFor(t, "the circuit breaker is open") + // Had the next request asked waf, its question would have reached + // the stand-in before the request reached the app. + var id string select { - case <-standIn.questions: - t.Error("waf was asked, want it not to be") - case <-time.After(10 * pollInterval): + case id = <-nextID: + default: + t.Fatal("the app did not get the next request") + } + + for len(standIn.questions) > 0 { + asked := <-standIn.questions + if asked.header.Get(requestIDHeader) == id { + t.Error("waf was asked, want it not to be") + } } }) }