artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

System test updates for CentralControllerPort. (#1182)

Browse Source
This commit is contained in:
hillsp
2016-04-28 15:45:29 -04:00
parent e885e02a3c
commit 090ec03a68
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/nginx_system_test.sh
+2
View File
@@ -31,6 +31,7 @@
: ${NATIVE_FETCHER:?"Set NATIVE_FETCHER to off or on"} : ${NATIVE_FETCHER:?"Set NATIVE_FETCHER to off or on"}
: ${PRIMARY_PORT:?"Set PRIMARY_PORT"} : ${PRIMARY_PORT:?"Set PRIMARY_PORT"}
: ${SECONDARY_PORT:?"Set SECONDARY_PORT"} : ${SECONDARY_PORT:?"Set SECONDARY_PORT"}
: ${CONTROLLER_PORT:?"Set CONTROLLER_PORT"}
: ${RCPORT1:?"Set RCPORT1"} : ${RCPORT1:?"Set RCPORT1"}
: ${RCPORT2:?"Set RCPORT2"} : ${RCPORT2:?"Set RCPORT2"}
: ${RCPORT2:?"Set RCPORT3"} : ${RCPORT2:?"Set RCPORT3"}
@@ -200,6 +201,7 @@ cat $PAGESPEED_CONF_TEMPLATE \
| sed 's#@@SERVER_ROOT@@#'"$SERVER_ROOT"'#' \ | sed 's#@@SERVER_ROOT@@#'"$SERVER_ROOT"'#' \
| sed 's#@@PRIMARY_PORT@@#'"$PRIMARY_PORT"'#' \ | sed 's#@@PRIMARY_PORT@@#'"$PRIMARY_PORT"'#' \
| sed 's#@@SECONDARY_PORT@@#'"$SECONDARY_PORT"'#' \ | sed 's#@@SECONDARY_PORT@@#'"$SECONDARY_PORT"'#' \
| sed 's#@@CONTROLLER_PORT@@#'"$CONTROLLER_PORT"'#' \
| sed 's#@@NATIVE_FETCHER@@#'"$NATIVE_FETCHER"'#' \ | sed 's#@@NATIVE_FETCHER@@#'"$NATIVE_FETCHER"'#' \
| sed 's#@@RESOLVER@@#'"$RESOLVER"'#' \ | sed 's#@@RESOLVER@@#'"$RESOLVER"'#' \
| sed 's#@@RCPORT1@@#'"$RCPORT1"'#' \ | sed 's#@@RCPORT1@@#'"$RCPORT1"'#' \
test/pagespeed_test.conf.template
+2
View File
@@ -79,6 +79,8 @@ http {
pagespeed StatisticsLogging on; pagespeed StatisticsLogging on;
pagespeed LogDir "@@TEST_TMP@@/logdir"; pagespeed LogDir "@@TEST_TMP@@/logdir";
pagespeed CentralControllerPort @@CONTROLLER_PORT@@;
server { server {
# Sets up a logical home-page server on # Sets up a logical home-page server on
# max-cacheable-content-length.example.com. This server is only used to # max-cacheable-content-length.example.com. This server is only used to
test/run_tests.sh
+2
View File
@@ -56,6 +56,7 @@ SECONDARY_PORT="$2"
MOD_PAGESPEED_DIR="$3" MOD_PAGESPEED_DIR="$3"
NGINX_EXECUTABLE="$4" NGINX_EXECUTABLE="$4"
PAGESPEED_TEST_HOST="$5" PAGESPEED_TEST_HOST="$5"
CONTROLLER_PORT=8053
RCPORT1=9991 RCPORT1=9991
RCPORT2=9992 RCPORT2=9992
RCPORT3=9993 RCPORT3=9993
@@ -74,6 +75,7 @@ function run_test_checking_failure() {
NGINX_EXECUTABLE="$NGINX_EXECUTABLE" \ NGINX_EXECUTABLE="$NGINX_EXECUTABLE" \
PAGESPEED_TEST_HOST="$PAGESPEED_TEST_HOST" \ PAGESPEED_TEST_HOST="$PAGESPEED_TEST_HOST" \
RUN_TESTS="$RUN_TESTS" \ RUN_TESTS="$RUN_TESTS" \
CONTROLLER_PORT="$CONTROLLER_PORT" \
RCPORT1="$RCPORT1" \ RCPORT1="$RCPORT1" \
RCPORT2="$RCPORT2" \ RCPORT2="$RCPORT2" \
RCPORT3="$RCPORT3" \ RCPORT3="$RCPORT3" \