Mercurial > hg > nginx-tests

changeset 1948:78452573505c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: improved server tokens tests to accept alternative names.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Feb 2024 20:10:15 +0300
parents 1d980c5013dc
children 6e4a480ab370
files h2_server_tokens.t h3_server_tokens.t
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/h2_server_tokens.t
+++ b/h2_server_tokens.t
@@ -96,15 +96,15 @@ open STDERR, ">&", \*OLDERR;
 
 ###############################################################################
 
-my $re = qr/nginx\/\d+\.\d+\.\d+/;
+my $re = qr/\w+\/\d+\.\d+\.\d+/;
 
 like(header_server('/200'), qr/^$re$/, 'http2 tokens default 200');
 like(header_server('/404'), qr/^$re$/, 'http2 tokens default 404');
 like(body('/404'), qr/$re/, 'http2 tokens default 404 body');
 
-is(header_server('/off/200'), 'nginx', 'http2 tokens off 200');
-is(header_server('/off/404'), 'nginx', 'http2 tokens off 404');
-like(body('/off/404'), qr/nginx(?!\/)/, 'http2 tokens off 404 body');
+like(header_server('/off/200'), qr/^\w+$/, 'http2 tokens off 200');
+like(header_server('/off/404'), qr/^\w+$/, 'http2 tokens off 404');
+unlike(body('/off/404'), $re, 'http2 tokens off 404 body');
 
 like(header_server('/on/200'), qr/^$re$/, 'http2 tokens on 200');
 like(header_server('/on/404'), qr/^$re$/, 'http2 tokens on 404');
--- a/h3_server_tokens.t
+++ b/h3_server_tokens.t
@@ -115,15 +115,15 @@ foreach my $name ('localhost') {
 
 ###############################################################################
 
-my $re = qr/nginx\/\d+\.\d+\.\d+/;
+my $re = qr/\w+\/\d+\.\d+\.\d+/;
 
 like(header_server('/200'), qr/^$re$/, 'http3 tokens default 200');
 like(header_server('/404'), qr/^$re$/, 'http3 tokens default 404');
 like(body('/404'), qr/$re/, 'http3 tokens default 404 body');
 
-is(header_server('/off/200'), 'nginx', 'http3 tokens off 200');
-is(header_server('/off/404'), 'nginx', 'http3 tokens off 404');
-like(body('/off/404'), qr/nginx(?!\/)/, 'http3 tokens off 404 body');
+like(header_server('/off/200'), qr/^\w+$/, 'http3 tokens off 200');
+like(header_server('/off/404'), qr/^\w+$/, 'http3 tokens off 404');
+unlike(body('/off/404'), $re, 'http3 tokens off 404 body');
 
 like(header_server('/on/200'), qr/^$re$/, 'http3 tokens on 200');
 like(header_server('/on/404'), qr/^$re$/, 'http3 tokens on 404');