From f91628262ddad4510717227cec6b68a407b1417f Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Thu, 20 Jun 2019 13:06:16 +0200 Subject: [PATCH] Fix curl testing of test list Ref: #264 --- .dev-tools/generate-files.sh | 1 + .dev-tools/install-nginx-testing-of-changes.sh | 10 +++++++--- .dev-tools/run-curl-tests-testing-of-changes.sh | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.dev-tools/generate-files.sh b/.dev-tools/generate-files.sh index fd002c25c..05cfdd794 100755 --- a/.dev-tools/generate-files.sh +++ b/.dev-tools/generate-files.sh @@ -57,6 +57,7 @@ sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/run-curl-tests-1.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/run-curl-tests-2.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/run-curl-tests-3.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/run-curl-tests-4.sh +sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/run-curl-testing-of-changes.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/prepare-robots-input.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/install-nginx-1.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/install-nginx-2.sh diff --git a/.dev-tools/install-nginx-testing-of-changes.sh b/.dev-tools/install-nginx-testing-of-changes.sh index 7c10994c6..3f332fb00 100644 --- a/.dev-tools/install-nginx-testing-of-changes.sh +++ b/.dev-tools/install-nginx-testing-of-changes.sh @@ -58,15 +58,19 @@ sudo service nginx reload sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/default13.vhost /etc/nginx/sites-available/default.vhost sudo service nginx reload +sudo systemctl enable nginx +sudo systemctl start nginx +sudo systemctl reload nginx + # ********************** # Now Run our Curl Tests # ********************** printf '\n%s\n%s\n%s\n\n' "######################" "Now Run our Curl Tests" "######################" -# ************************************************************ -# Copy all .conf files used in Test 3 to a folder for checking -# ************************************************************ +# ************************************************************* +# Copy all .conf files used in Testing to a folder for checking +# ************************************************************* sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/bots.d/ sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/conf.d/ diff --git a/.dev-tools/run-curl-tests-testing-of-changes.sh b/.dev-tools/run-curl-tests-testing-of-changes.sh index f5500db16..855bc2c53 100644 --- a/.dev-tools/run-curl-tests-testing-of-changes.sh +++ b/.dev-tools/run-curl-tests-testing-of-changes.sh @@ -218,6 +218,8 @@ run_curltest8 run_curltest9 run_curltest10 +echo "Tests Completed" + # ********************** # Exit With Error Number # **********************