diff --git a/t/000_init.t b/t/000_init.t index 6c96c571..90ab5ed8 100644 --- a/t/000_init.t +++ b/t/000_init.t @@ -7,10 +7,12 @@ repeat_each(1); plan tests => repeat_each() * blocks(); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ diff --git a/t/auth.t b/t/auth.t index 3443a401..91e46f54 100644 --- a/t/auth.t +++ b/t/auth.t @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * (blocks() * 3 - 2 * 1); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ diff --git a/t/errors.t b/t/errors.t index a236cbd6..f09e7972 100644 --- a/t/errors.t +++ b/t/errors.t @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * blocks(); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ @@ -38,8 +40,8 @@ GET /postgres === TEST 2: wrong credentials --- http_config upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=wrong_pass; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=wrong_pass; } --- config location /postgres { diff --git a/t/eval.t b/t/eval.t index d89dbc73..320b0aae 100644 --- a/t/eval.t +++ b/t/eval.t @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * (blocks() * 3); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ @@ -24,8 +26,8 @@ __DATA__ === TEST 1: sanity --- http_config upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } server { diff --git a/t/form.disabled b/t/form.disabled index 84be8486..f93996c1 100644 --- a/t/form.disabled +++ b/t/form.disabled @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * (blocks() * 3); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ diff --git a/t/methods.t b/t/methods.t index bca35191..866f7077 100644 --- a/t/methods.t +++ b/t/methods.t @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * (blocks() * 3 - 2 * 2); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ diff --git a/t/output.t b/t/output.t index 728a8841..b5dd728e 100644 --- a/t/output.t +++ b/t/output.t @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * (blocks() * 3 - 4 * 2); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ diff --git a/t/restful.t b/t/restful.t index 83f1fae3..f3407a3b 100644 --- a/t/restful.t +++ b/t/restful.t @@ -7,10 +7,12 @@ repeat_each(1); plan tests => repeat_each() * (blocks() * 3); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ diff --git a/t/restful_json.t b/t/restful_json.t index 3adb7e58..10ca6c06 100644 --- a/t/restful_json.t +++ b/t/restful_json.t @@ -7,10 +7,12 @@ repeat_each(1); plan tests => repeat_each() * (blocks() * 3); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ diff --git a/t/rewrites.t b/t/rewrites.t index d617e4de..b82a785c 100644 --- a/t/rewrites.t +++ b/t/rewrites.t @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * (blocks() * 2); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ diff --git a/t/sanity.t b/t/sanity.t index eb36ff01..23363de9 100644 --- a/t/sanity.t +++ b/t/sanity.t @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * (blocks() * 3); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_ @@ -24,8 +26,8 @@ __DATA__ === TEST 1: sanity --- http_config upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; postgres_keepalive off; } --- config diff --git a/t/variables.t b/t/variables.t index 60229139..de6ec7fa 100644 --- a/t/variables.t +++ b/t/variables.t @@ -7,10 +7,12 @@ repeat_each(2); plan tests => repeat_each() * (blocks() * 3 + 1 * 4 + 1 * 1 - 5 * 2); +$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432; + our $http_config = <<'_EOC_'; upstream database { - postgres_server 127.0.0.1:5432 dbname=ngx_test - user=ngx_test password=ngx_test; + postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT + dbname=ngx_test user=ngx_test password=ngx_test; } _EOC_