Implement non-persistent connections in a cleaner way. Every test

that offers multiple requets per HTTP connection is run twice.
First all requests are run over a single TCP connection.  Then for
each requests a separate TCP connection is established.  If a
requests during a persistent connection fails, a reconnect is done
as relayd cancels the whole connection.  This allows stricter tests
for filters.
OK reyk@

1 files changed, 5 insertions, 13 deletions

diff --git a/regress/usr.sbin/relayd/args-http-filter-url-file.pl b/regress/usr.sbin/relayd/args-http-filter-url-file.pl
index 363769555e9..06a7545c0f2 100644
--- a/regress/usr.sbin/relayd/args-http-filter-url-file.pl
+++ b/regress/usr.sbin/relayd/args-http-filter-url-file.pl
@@ -7,14 +7,8 @@ our %args = (
 	func => \&http_client,
 	lengths => \@lengths,
 	loggrep => {
-		qr/403 Forbidden/ => 2,
-		qr/Server: OpenBSD relayd/ => 2,
-		qr/Connection: close/ => 2,
-		qr/Content-Length\: 3/ => 0,
-		qr/Content-Length\: 4/ => 1,
+		qr/403 Forbidden/ => 4,
 	},
-	mreqs => 1,
-	httpnok => 1,
     },
     relayd => {
 	protocol => [ "http",
@@ -23,17 +17,15 @@ our %args = (
 	    'block request url log file "$curdir/args-http-filter-url-file.in" value "*" label "test_reject_label"',
 	],
 	loggrep => {
-		qr/Forbidden/ => 2,
-		qr/\[test_reject_label\, foo\.bar\/0\]/ => 1,
-		qr/\[test_reject_label\, foo\.bar\/3\]/ => 1,
+		qr/Forbidden/ => 4,
+		qr/\[test_reject_label\, foo\.bar\/0\]/ => 2,
+		qr/\[test_reject_label\, foo\.bar\/3\]/ => 2,
 	},
     },
     server => {
 	func => \&http_server,
-	lengths => (1, 2, 4),
-	mreqs => 4,
-	nocheck => 1,
     },
+    lengths => [1, 2, 4, 5],
 );
 
 1;