diff proxy_keepalive.t @ 272:957fe2a76aa7

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
line wrap: on
line diff
--- a/proxy_keepalive.t
+++ b/proxy_keepalive.t
@@ -24,7 +24,7 @@ use Test::Nginx;
 select STDERR; $| = 1;
 select STDOUT; $| = 1;
 
-my $t = Test::Nginx->new()->has(qw/http proxy ssi rewrite/)
+my $t = Test::Nginx->new()->has(qw/http proxy ssi rewrite/)->plan(50)
 	->write_file_expand('nginx.conf', <<'EOF');
 
 %%TEST_GLOBALS%%
@@ -73,15 +73,7 @@ EOF
 	'set: <!--#echo var="x" -->');
 
 $t->run_daemon(\&http_daemon);
-
-eval {
-	open OLDERR, ">&", \*STDERR; close STDERR;
-	$t->run();
-	open STDERR, ">&", \*OLDERR;
-};
-plan(skip_all => 'no keepalive patches') if $@;
-
-$t->plan(50);
+$t->run();
 
 ###############################################################################