comparison stream_proxy_protocol_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 882267679006
children 8ef51dbb5d69
comparison
equal deleted inserted replaced
1019:41139d6f8b7b 1020:196d33c2bb45
25 select STDOUT; $| = 1; 25 select STDOUT; $| = 1;
26 26
27 eval { require IO::Socket::SSL; }; 27 eval { require IO::Socket::SSL; };
28 plan(skip_all => 'IO::Socket::SSL not installed') if $@; 28 plan(skip_all => 'IO::Socket::SSL not installed') if $@;
29 29
30 my $t = Test::Nginx->new()->has(qw/stream stream_ssl/)->has_daemon('openssl'); 30 my $t = Test::Nginx->new()->has(qw/stream stream_ssl/)->has_daemon('openssl')
31 ->plan(2);
31 32
32 $t->write_file_expand('nginx.conf', <<'EOF'); 33 $t->write_file_expand('nginx.conf', <<'EOF');
33 34
34 %%TEST_GLOBALS%% 35 %%TEST_GLOBALS%%
35 36
74 or die "Can't create certificate for $name: $!\n"; 75 or die "Can't create certificate for $name: $!\n";
75 } 76 }
76 77
77 $t->run_daemon(\&stream_daemon_ssl, port(8081), path => $d, pp => 1); 78 $t->run_daemon(\&stream_daemon_ssl, port(8081), path => $d, pp => 1);
78 $t->run_daemon(\&stream_daemon_ssl, port(8083), path => $d, pp => 0); 79 $t->run_daemon(\&stream_daemon_ssl, port(8083), path => $d, pp => 0);
79 $t->try_run('no stream proxy_protocol')->plan(2); 80 $t->run();
80 81
81 $t->waitforsocket('127.0.0.1:' . port(8081)); 82 $t->waitforsocket('127.0.0.1:' . port(8081));
82 $t->waitforsocket('127.0.0.1:' . port(8083)); 83 $t->waitforsocket('127.0.0.1:' . port(8083));
83 84
84 ############################################################################### 85 ###############################################################################