Mercurial > hg > nginx-tests

changeset 1197:155573499f20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: more ssl session tests. Check that SSL session can be resumed if it was retrieved from within or after the abbreviated handshake.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 20 Jul 2017 14:47:59 +0300
parents 68c8f2778c50
children cd153f1bbaad
files proxy_ssl.t stream_proxy_ssl.t stream_upstream_zone_ssl.t upstream_zone_ssl.t
diffstat 4 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/proxy_ssl.t
+++ b/proxy_ssl.t
@@ -25,7 +25,7 @@ eval { require IO::Socket::SSL; };
 plan(skip_all => 'IO::Socket::SSL not installed') if $@;
 
 my $t = Test::Nginx->new()->has(qw/http proxy http_ssl/)->has_daemon('openssl')
-	->plan(6)->write_file_expand('nginx.conf', <<'EOF');
+	->plan(7)->write_file_expand('nginx.conf', <<'EOF');
 
 %%TEST_GLOBALS%%
 
@@ -109,6 +109,7 @@ like(http_get('/ssl'), qr/200 OK.*X-Sess
 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl 2');
 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: \./s, 'ssl session new');
 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused');
+like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused 2');
 like(http_get('/timeout'), qr/200 OK/, 'proxy connect timeout');
 
 TODO: {
--- a/stream_proxy_ssl.t
+++ b/stream_proxy_ssl.t
@@ -25,7 +25,7 @@ select STDOUT; $| = 1;
 
 my $t = Test::Nginx->new()->has(qw/stream stream_ssl http http_ssl/)
 	->has(qw/stream_return/)
-	->has_daemon('openssl')->plan(5);
+	->has_daemon('openssl')->plan(6);
 
 $t->write_file_expand('nginx.conf', <<'EOF');
 
@@ -110,6 +110,7 @@ is(stream('127.0.0.1:' . port(8081))->re
 
 is(stream('127.0.0.1:' . port(8082))->read(), '.', 'ssl session new');
 is(stream('127.0.0.1:' . port(8082))->read(), 'r', 'ssl session reused');
+is(stream('127.0.0.1:' . port(8082))->read(), 'r', 'ssl session reused 2');
 
 my $s = http('', start => 1);
 
--- a/stream_upstream_zone_ssl.t
+++ b/stream_upstream_zone_ssl.t
@@ -24,7 +24,7 @@ select STDERR; $| = 1;
 select STDOUT; $| = 1;
 
 my $t = Test::Nginx->new()->has(qw/stream stream_ssl stream_return/)
-	->has(qw/stream_upstream_zone/)->has_daemon('openssl')->plan(8);
+	->has(qw/stream_upstream_zone/)->has_daemon('openssl')->plan(9);
 
 $t->write_file_expand('nginx.conf', <<'EOF');
 
@@ -111,6 +111,7 @@ is(stream('127.0.0.1:' . port(8080))->re
 
 is(stream('127.0.0.1:' . port(8081))->read(), '.', 'ssl session new');
 is(stream('127.0.0.1:' . port(8081))->read(), 'r', 'ssl session reused');
+is(stream('127.0.0.1:' . port(8081))->read(), 'r', 'ssl session reused 2');
 
 is(stream('127.0.0.1:' . port(8082))->read(), '.', 'backup ssl');
 is(stream('127.0.0.1:' . port(8082))->read(), '.', 'backup ssl 2');
--- a/upstream_zone_ssl.t
+++ b/upstream_zone_ssl.t
@@ -23,7 +23,7 @@ select STDERR; $| = 1;
 select STDOUT; $| = 1;
 
 my $t = Test::Nginx->new()->has(qw/http proxy http_ssl upstream_zone/)
-	->has_daemon('openssl')->plan(8)
+	->has_daemon('openssl')->plan(9)
 	->write_file_expand('nginx.conf', <<'EOF');
 
 %%TEST_GLOBALS%%
@@ -115,6 +115,7 @@ like(http_get('/ssl'), qr/200 OK.*X-Sess
 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl 2');
 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: \./s, 'ssl session new');
 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused');
+like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused 2');
 
 like(http_get('/backup'), qr/200 OK.*X-Session: \./s, 'backup');
 like(http_get('/backup'), qr/200 OK.*X-Session: \./s, 'backup 2');