diff --git a/internal/rproxy/rproxy_test.go b/internal/rproxy/rproxy_test.go index 7396921..9f7a053 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,30 @@ 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) } 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") + } } }) }