comparison upstream_zone_ssl.t @ 1020:196d33c2bb45

Tests: removed TODO and try_run() checks for legacy versions. Also removed now unused spdy.t and shmem prerequisite.
author Andrey Zelenkov <zelenkov@nginx.com>
date Wed, 31 Aug 2016 18:21:07 +0300
parents 325db3d62466
children 8ef51dbb5d69
comparison
equal deleted inserted replaced
1019:41139d6f8b7b 1020:196d33c2bb45
21 21
22 select STDERR; $| = 1; 22 select STDERR; $| = 1;
23 select STDOUT; $| = 1; 23 select STDOUT; $| = 1;
24 24
25 my $t = Test::Nginx->new()->has(qw/http proxy http_ssl upstream_zone/) 25 my $t = Test::Nginx->new()->has(qw/http proxy http_ssl upstream_zone/)
26 ->has_daemon('openssl')->write_file_expand('nginx.conf', <<'EOF'); 26 ->has_daemon('openssl')->plan(8)
27 ->write_file_expand('nginx.conf', <<'EOF');
27 28
28 %%TEST_GLOBALS%% 29 %%TEST_GLOBALS%%
29 30
30 daemon off; 31 daemon off;
31 32
104 . "-out '$d/$name.crt' -keyout '$d/$name.key' " 105 . "-out '$d/$name.crt' -keyout '$d/$name.key' "
105 . ">>$d/openssl.out 2>&1") == 0 106 . ">>$d/openssl.out 2>&1") == 0
106 or die "Can't create certificate for $name: $!\n"; 107 or die "Can't create certificate for $name: $!\n";
107 } 108 }
108 109
109 $t->try_run('no upstream zone')->plan(8); 110 $t->run();
110 111
111 ############################################################################### 112 ###############################################################################
112 113
113 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl'); 114 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl');
114 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl 2'); 115 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl 2');