Mercurial > hg > nginx-tests

comparison proxy_keepalive.t @ 272:957fe2a76aa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: remove conditional startup from upstream keepalive tests.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 21 Mar 2013 20:40:26 +0400
parents 0c9f15938545
children 36c75df75ca4
comparison
equal deleted inserted replaced
271:1a6eef7ac914 272:957fe2a76aa7
22 ############################################################################### 22 ###############################################################################
23 23
24 select STDERR; $| = 1; 24 select STDERR; $| = 1;
25 select STDOUT; $| = 1; 25 select STDOUT; $| = 1;
26 26
27 my $t = Test::Nginx->new()->has(qw/http proxy ssi rewrite/) 27 my $t = Test::Nginx->new()->has(qw/http proxy ssi rewrite/)->plan(50)
28 ->write_file_expand('nginx.conf', <<'EOF'); 28 ->write_file_expand('nginx.conf', <<'EOF');
29 29
30 %%TEST_GLOBALS%% 30 %%TEST_GLOBALS%%
31 31
32 daemon off; 32 daemon off;
71 $t->write_file('ssi.html', 71 $t->write_file('ssi.html',
72 '<!--#include virtual="/include$request_uri" set="x" -->' . 72 '<!--#include virtual="/include$request_uri" set="x" -->' .
73 'set: <!--#echo var="x" -->'); 73 'set: <!--#echo var="x" -->');
74 74
75 $t->run_daemon(\&http_daemon); 75 $t->run_daemon(\&http_daemon);
76 76 $t->run();
77 eval {
78 open OLDERR, ">&", \*STDERR; close STDERR;
79 $t->run();
80 open STDERR, ">&", \*OLDERR;
81 };
82 plan(skip_all => 'no keepalive patches') if $@;
83
84 $t->plan(50);
85 77
86 ############################################################################### 78 ###############################################################################
87 79
88 # There are 3 mostly independend modes of upstream operation: 80 # There are 3 mostly independend modes of upstream operation:
89 # 81 #