From: Willy Tarreau <w@1wt.eu>
Date: Fri, 20 Aug 2021 09:12:47 +0000 (+0200)
Subject: REGTESTS: abortonclose: after retries, 503 is expected, not close
X-Git-Tag: v2.5-dev5~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1713eec36d347e7e7d6208980f0abd2db8d1cd81;p=thirdparty%2Fhaproxy.git

REGTESTS: abortonclose: after retries, 503 is expected, not close

The abortonclose test was only expecting a close after all server
retries were exhausted, it didn't check for the pending 503, which
fails with new versions of vtest starting with commit 8d6c6bd
("Leak-plugging on barriers").

This may be backported, but carefully in case older versions would
really close without responding.
---

diff --git a/reg-tests/http-messaging/http_abortonclose.vtc b/reg-tests/http-messaging/http_abortonclose.vtc
index c083f29f1a..3a7208574f 100644
--- a/reg-tests/http-messaging/http_abortonclose.vtc
+++ b/reg-tests/http-messaging/http_abortonclose.vtc
@@ -83,7 +83,8 @@ haproxy h1 -conf {
 # No server, wait all connection retries : SC--
 client  c1 -connect ${h1_fe1_sock} {
     txreq -url /c1
-    expect_close
+    rxresp
+    expect resp.status == 503
 } -run
 
 # Wait c1 log entry