Mercurial > hg > nginx-tests
diff ssl.t @ 1139:e7e968e3eb74
Tests: split ssl.t to run relevant tests on stable versions again.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Wed, 01 Mar 2017 18:04:25 +0300 |
parents | 3d312b6a1a19 |
children | 0af58b78df35 |
line wrap: on
line diff
--- a/ssl.t +++ b/ssl.t @@ -29,7 +29,7 @@ eval { IO::Socket::SSL::SSL_VERIFY_NONE( plan(skip_all => 'IO::Socket::SSL too old') if $@; my $t = Test::Nginx->new()->has(qw/http http_ssl rewrite/) - ->has_daemon('openssl'); + ->has_daemon('openssl')->plan(20); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -66,9 +66,6 @@ http { location /cipher { return 200 "body $ssl_cipher"; } - location /ciphers { - return 200 "body $ssl_ciphers"; - } location /client_verify { return 200 "body $ssl_client_verify"; } @@ -76,13 +73,10 @@ http { return 200 "body $ssl_protocol"; } location /issuer { - return 200 "body $ssl_client_i_dn:$ssl_client_i_dn_legacy"; + return 200 "body $ssl_client_i_dn"; } location /subject { - return 200 "body $ssl_client_s_dn:$ssl_client_s_dn_legacy"; - } - location /time { - return 200 "body $ssl_client_v_start!$ssl_client_v_end!$ssl_client_v_remain"; + return 200 "body $ssl_client_s_dn"; } } @@ -196,7 +190,7 @@ my $ctx = new IO::Socket::SSL::SSL_Conte SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(), SSL_session_cache_size => 100); -$t->try_run('no ssl_ciphers')->plan(22); +$t->run(); ############################################################################### @@ -238,15 +232,16 @@ like(get('/', 8081), qr/^body \.$/m, 'se like(get('/id', 8085), qr/^body \w{64}$/m, 'session id'); unlike(http_get('/id'), qr/body \w/, 'session id no ssl'); like(get('/cipher', 8085), qr/^body [\w-]+$/m, 'cipher'); - -$s = get_ssl_socket(undef, port(8085)); -like(http_get('/ciphers', socket => $s), qr/^body [:\w-]+$/m, 'ciphers'); - like(get('/client_verify', 8085), qr/^body NONE$/m, 'client verify'); like(get('/protocol', 8085), qr/^body (TLS|SSL)v(\d|\.)+$/m, 'protocol'); -like(cert('/issuer', 8085), qr!^body CN=issuer:/CN=issuer$!m, 'issuer'); -like(cert('/subject', 8085), qr!^body CN=subject:/CN=subject$!m, 'subject'); -like(cert('/time', 8085), qr/^body [:\s\w]+![:\s\w]+![23]$/m, 'time'); + +TODO: { +local $TODO = 'not yet' unless $t->has_version('1.11.6'); + +like(cert('/issuer', 8085), qr!^body CN=issuer$!m, 'issuer'); +like(cert('/subject', 8085), qr!^body CN=subject$!m, 'subject'); + +} ###############################################################################