Skip to content

Commit 0487da7

Browse files
committed
Tests: fixed proxy protocol v2 TLVs test prerequisites.
1 parent 4f996ab commit 0487da7

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

proxy_protocol2_tlv.t

+7-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ like($r, qr/X-ALPN: ALPN1-ALPN1\x0d?$/m, 'ALPN');
106106
like($r, qr/X-AUTHORITY: localhost-localhost\x0d?$/m, 'AUTHORITY');
107107
like($r, qr/X-TLV-CRC32C: 4321\x0d?$/m, 'CRC32C');
108108
like($r, qr/X-UNIQUE-ID: UNIQQ-UNIQQ\x0d?$/m, 'UNIQUE_ID');
109-
like($r, qr/X-SSL-BINARY: true/, 'SSL_BINARY');
110109
like($r, qr/X-SSL-VERIFY: 255\x0d?$/m, 'SSL_VERIFY');
111110
like($r, qr/X-SSL-VERSION: TLSv1.2-TLSv1.2\x0d?$/m, 'SSL_VERSION');
112111
like($r, qr/X-SSL-CN: example.com-example.com\x0d?$/m, 'SSL_CN');
@@ -117,6 +116,13 @@ like($r, qr/X-NETNS: NETNS-NETNS\x0d?$/m, 'NETNS');
117116
like($r, qr/X-TLV-CUSTOM: 12345\x0d?$/m, 'custom');
118117
like($r, qr/X-TLV-X: -\x0d?$/m, 'non-existent');
119118

119+
SKIP: {
120+
skip 'no PCRE', 1 unless $t->has_module('rewrite');
121+
122+
like($r, qr/X-SSL-BINARY: true/, 'SSL_BINARY');
123+
124+
}
125+
120126
###############################################################################
121127

122128
sub pp_get {

stream_proxy_protocol2_tlv.t

+7-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use Test::Nginx::Stream qw/ stream /;
2424
select STDERR; $| = 1;
2525
select STDOUT; $| = 1;
2626

27-
my $t = Test::Nginx->new()->has(qw/stream stream_return map/)
27+
my $t = Test::Nginx->new()->has(qw/stream stream_return stream_map/)
2828
->write_file_expand('nginx.conf', <<'EOF');
2929
3030
%%TEST_GLOBALS%%
@@ -105,10 +105,16 @@ like($r, qr/ssl-cn:example.com\x0d?$/m, 'SSL_CN');
105105
like($r, qr/ssl-cipher:AES256-SHA\x0d?$/m, 'SSL_CIPHER');
106106
like($r, qr/ssl-sig-alg:SHA1\x0d?$/m, 'SSL_SIG_ALG');
107107
like($r, qr/ssl-key-alg:RSA512\x0d?$/m, 'SSL_KEY_ALG');
108+
109+
SKIP: {
110+
skip 'no PCRE', 1 unless $t->has_module('rewrite');
111+
108112
like($r, qr/ssl-binary:true/, 'SSL_BINARY');
109113

110114
}
111115

116+
}
117+
112118
###############################################################################
113119

114120
sub pp_get {

0 commit comments

Comments
 (0)