From 3b9cb600596a4436c10f1b01a46d1b102fd4399a Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Wed, 2 Jun 2021 17:23:47 +0200 Subject: [PATCH] REGTESTS: Fix http_abortonclose.vtc to support -1 status for some client aborts Since the commit 5e702fcad ("MINOR: http-ana: Use -1 status for client aborts during queuing and connect"), -1 status is reported in the log message when the client aborts during queuing and connect. http_abortonclose.vtc script must be update accordingly. --- reg-tests/http-messaging/http_abortonclose.vtc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reg-tests/http-messaging/http_abortonclose.vtc b/reg-tests/http-messaging/http_abortonclose.vtc index ae0d237ae8..11efef7bb5 100644 --- a/reg-tests/http-messaging/http_abortonclose.vtc +++ b/reg-tests/http-messaging/http_abortonclose.vtc @@ -4,7 +4,7 @@ feature ignore_unknown_macro # NOTE : This test may fail if too many vtest are running in parallel because # the port reserved for closed s1 server may be reused by another vtest -#REQUIRE_VERSION=2.3 +#REQUIRE_VERSION=2.5 #REGTEST_TYPE=slow # b1 : Don't send /c4 before /c3 was received by s2 server @@ -36,10 +36,10 @@ syslog S -level info { expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe1 be1/srv1 [0-9]*/[0-9]*/-1/-1/[0-9]* 503 .* - - SC-- .* .* \"GET /c1 HTTP/1\\.1\"" barrier b2 sync recv - expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe1 be1/srv1 [0-9]*/[0-9]*/-1/-1/[0-9]* 503 .* - - CC-- .* .* \"GET /c2 HTTP/1\\.1\"" + expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe1 be1/srv1 [0-9]*/[0-9]*/-1/-1/[0-9]* -1 .* - - CC-- .* .* \"GET /c2 HTTP/1\\.1\"" recv - expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe2 be2/ [0-9]*/[0-9]*/-1/-1/[0-9]* 503 .* - - CQ-- .* .* \"GET /c4 HTTP/1\\.1\"" + expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe2 be2/ [0-9]*/[0-9]*/-1/-1/[0-9]* -1 .* - - CQ-- .* .* \"GET /c4 HTTP/1\\.1\"" barrier b2 sync recv expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe2 be2/srv1 [0-9]*/[0-9]*/[0-9]*/-1/[0-9]* 400 .* - - CH-- .* .* \"GET /c3 HTTP/1\\.1\""