# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1363884026 -14400
# Node ID 957fe2a76aa7c32ea4da0caac889f213aa603574
# Parent  1a6eef7ac9141d71b8d42fe88f71452ec7c224b8
Tests: remove conditional startup from upstream keepalive tests.

diff --git a/fastcgi_keepalive.t b/fastcgi_keepalive.t
--- a/fastcgi_keepalive.t
+++ b/fastcgi_keepalive.t
@@ -21,7 +21,7 @@ use Test::Nginx;
 select STDERR; $| = 1;
 select STDOUT; $| = 1;
 
-my $t = Test::Nginx->new()->write_file_expand('nginx.conf', <<'EOF');
+my $t = Test::Nginx->new()->write_file_expand('nginx.conf', <<'EOF')->plan(6);
 
 %%TEST_GLOBALS%%
 
@@ -52,15 +52,7 @@ http {
 EOF
 
 $t->run_daemon(\&fastcgi_test_daemon);
-
-eval {
-	open OLDERR, ">&", \*STDERR; close STDERR;
-	$t->run();
-	open STDERR, ">&", \*OLDERR;
-};
-plan(skip_all => 'no keepalive patches') if $@;
-
-$t->plan(6);
+$t->run();
 
 ###############################################################################
 
diff --git a/proxy_keepalive.t b/proxy_keepalive.t
--- 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();
 
 ###############################################################################