waf: wait as long as it takes for a test request's answer (closes #454)
check / check (push) Failing after 2m29s
check / check (push) Failing after 2m29s
requestWithBody gave the answer 10 seconds, and endedLines gave the log line 10 seconds. On a busy host the Core Rule Set's inspection of a request with 1000 query parameters, under the race detector, took longer. Both now wait until the answer or line comes; go test's -timeout ends a test where it never does. Model: opus-5-5
This commit was merged in pull request #468.
This commit is contained in:
1 parent
433d5cc0a9
commit
40386dce6e
2 files changed
+6
-11
No files matched your search
@@ -193,11 +193,11 @@ func (o *output) requestLine(t *testing.T) logLine {
|
||||
// endedLines waits for count requests that went through rproxy, or to waf's
|
||||
// own endpoints, to have ended, and returns the last log line of each, in the
|
||||
// order waf took them. A question's last line is the one its report writes.
|
||||
// It waits as long as it takes, as requestWithBody does.
|
||||
func (o *output) endedLines(t *testing.T, count int) []logLine {
|
||||
t.Helper()
|
||||
|
||||
deadline := time.Now().Add(waitLimit)
|
||||
for time.Now().Before(deadline) {
|
||||
for {
|
||||
found := o.lastLines(t)
|
||||
|
||||
ended := len(found) >= count
|
||||
@@ -213,10 +213,6 @@ func (o *output) endedLines(t *testing.T, count int) []logLine {
|
||||
|
||||
time.Sleep(pollInterval)
|
||||
}
|
||||
|
||||
t.Fatalf("fewer than %d requests have ended after %s", count, waitLimit)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// lastLines returns the last request log line written so far of each request,
|
||||
|
||||
Reference in new issue
Block a user