Skip to content

remove the hard-coded 8.8.8.8 and do a cleanup of TEST_NGINX_RESOLVER #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

remove the hard-coded 8.8.8.8 and do a cleanup of TEST_NGINX_RESOLVER #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a0f9af
Update timeout.t
gnought Nov 28, 2017
a836f04
Update sanity.t
gnought Nov 28, 2017
a36b0aa
Update proto.t
gnought Nov 28, 2017
076662a
Update flush.t
gnought Nov 28, 2017
5188495
Update bug.t
gnought Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion t/bug.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ our $HttpConfig = qq{
lua_package_cpath "/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;";
};

$ENV{TEST_NGINX_RESOLVER} = '8.8.8.8';
$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;

no_long_string();
Expand Down
1 change: 0 additions & 1 deletion t/flush.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ our $HttpConfig = qq{
lua_package_cpath "/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;";
};

$ENV{TEST_NGINX_RESOLVER} = '8.8.8.8';
$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;

no_long_string();
Expand Down
1 change: 0 additions & 1 deletion t/proto.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ our $HttpConfig = qq{
lua_package_cpath "/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;";
};

$ENV{TEST_NGINX_RESOLVER} = '8.8.8.8';
$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;

no_long_string();
Expand Down
1 change: 0 additions & 1 deletion t/sanity.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ our $HttpConfig = qq{
lua_package_cpath "/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;";
};

$ENV{TEST_NGINX_RESOLVER} = '8.8.8.8';
$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;

no_long_string();
Expand Down
8 changes: 4 additions & 4 deletions t/timeout.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ our $HttpConfig = qq{
lua_package_cpath "/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;";
};

$ENV{TEST_NGINX_RESOLVER} = '8.8.8.8';
$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;

no_long_string();
Expand All @@ -55,7 +55,7 @@ __DATA__
=== TEST 1: connect timeout
--- http_config eval: $::HttpConfig
--- config
resolver 8.8.8.8;
resolver $TEST_NGINX_RESOLVER;
location /t {
content_by_lua '
-- visit agentzh.org first to get DNS resolve done, then the
Expand Down Expand Up @@ -172,7 +172,7 @@ foo
=== TEST 4: return previous log error
--- http_config eval: $::HttpConfig
--- config
resolver 8.8.8.8;
resolver $TEST_NGINX_RESOLVER;
log_subrequest on;
location /main {
content_by_lua '
Expand Down Expand Up @@ -237,7 +237,7 @@ foo
=== TEST 5: flush race condition
--- http_config eval: $::HttpConfig
--- config
resolver 8.8.8.8;
resolver $TEST_NGINX_RESOLVER;
location /t {
content_by_lua '
-- visit agentzh.org first to get DNS resolve done, then the
Expand Down