Mercurial > hg > nginx-tests
changeset 275:6cbcfb4ef7ee
Tests: correct has() checks for upstream keepalive tests.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 21 Mar 2013 22:00:45 +0400 |
parents | ccebd3168b5b |
children | 94f8ee2f6688 |
files | fastcgi_keepalive.t lib/Test/Nginx.pm memcached_keepalive.t memcached_keepalive_stale.t proxy_keepalive.t |
diffstat | 5 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/fastcgi_keepalive.t Thu Mar 21 21:23:53 2013 +0400 +++ b/fastcgi_keepalive.t Thu Mar 21 22:00:45 2013 +0400 @@ -21,7 +21,8 @@ select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->write_file_expand('nginx.conf', <<'EOF')->plan(6); +my $t = Test::Nginx->new()->has(qw/http fastcgi upstream_keepalive/)->plan(6) + ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%%
--- a/lib/Test/Nginx.pm Thu Mar 21 21:23:53 2013 +0400 +++ b/lib/Test/Nginx.pm Thu Mar 21 22:00:45 2013 +0400 @@ -100,6 +100,10 @@ browser => '(?s)^(?!.*--without-http_browser_module)', upstream_ip_hash => '(?s)^(?!.*--without-http_upstream_ip_hash_module)', + upstream_least_conn + => '(?s)^(?!.*--without-http_upstream_least_conn_mod)', + upstream_keepalive + => '(?s)^(?!.*--without-http_upstream_keepalive_modu)', http => '(?s)^(?!.*--without-http(?!\S))', cache => '(?s)^(?!.*--without-http-cache)', pop3 => '(?s)^(?!.*--without-mail_pop3_module)',
--- a/memcached_keepalive.t Thu Mar 21 21:23:53 2013 +0400 +++ b/memcached_keepalive.t Thu Mar 21 22:00:45 2013 +0400 @@ -24,7 +24,8 @@ eval { require Cache::Memcached; }; plan(skip_all => 'Cache::Memcached not installed') if $@; -my $t = Test::Nginx->new()->has('rewrite')->has_daemon('memcached')->plan(16) +my $t = Test::Nginx->new()->has(qw/http memcached upstream_keepalive rewrite/) + ->has_daemon('memcached')->plan(16) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%%
--- a/memcached_keepalive_stale.t Thu Mar 21 21:23:53 2013 +0400 +++ b/memcached_keepalive_stale.t Thu Mar 21 22:00:45 2013 +0400 @@ -24,7 +24,8 @@ eval { require Cache::Memcached; }; plan(skip_all => 'Cache::Memcached not installed') if $@; -my $t = Test::Nginx->new()->has('rewrite')->has_daemon('memcached')->plan(2) +my $t = Test::Nginx->new()->has(qw/http memcached upstream_keepalive rewrite/) + ->has_daemon('memcached')->plan(2) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%%
--- a/proxy_keepalive.t Thu Mar 21 21:23:53 2013 +0400 +++ b/proxy_keepalive.t Thu Mar 21 22:00:45 2013 +0400 @@ -24,8 +24,8 @@ select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/http proxy ssi rewrite/)->plan(50) - ->write_file_expand('nginx.conf', <<'EOF'); +my $t = Test::Nginx->new()->has(qw/http proxy upstream_keepalive ssi rewrite/) + ->plan(50)->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%%