Fix testing of test list Ref: #264

This commit is contained in:
Mitchell Krog 2019-06-20 13:19:32 +02:00
parent f91628262d
commit bcbeba83b5
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
3 changed files with 8 additions and 13 deletions

View file

@ -41,9 +41,9 @@
# Run testing of test version # Run testing of test version
# ******************************************************* # ***********************************************************************
# Make sure we test latest generated globalblacklist.conf # Make sure we test latest generated globalblacklist-testing-version.conf
# ******************************************************* # ***********************************************************************
printf '\n%s\n%s\n%s\n\n' "##############################################################################" "Copy latest generated globalblacklist.conf file to test for any compile errors" "##############################################################################" printf '\n%s\n%s\n%s\n\n' "##############################################################################" "Copy latest generated globalblacklist.conf file to test for any compile errors" "##############################################################################"
sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/nginx/conf.d/globalblacklist.conf sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/nginx/conf.d/globalblacklist.conf
@ -55,13 +55,6 @@ sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/ngi
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################" printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload 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 # Now Run our Curl Tests
# ********************** # **********************

View file

@ -20,6 +20,8 @@
# Set Location of our Curl Test Results Files # Set Location of our Curl Test Results Files
# ******************************************* # *******************************************
echo "Tests Starting"
_curltest1=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest1.txt _curltest1=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest1.txt
_curltest2=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest2.txt _curltest2=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest2.txt
_curltest3=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest3.txt _curltest3=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest3.txt
@ -187,7 +189,7 @@ fi
} }
# ************************************************** # **************************************************
# Function Curl Test 9 - Check for Bad Bot "Nutch" # Function Curl Test 10 - Check for Bad Bot "Nutch"
# ************************************************** # **************************************************
run_curltest10 () { run_curltest10 () {

View file

@ -40,14 +40,14 @@ script:
- bash .dev-tools/generate-files.sh - bash .dev-tools/generate-files.sh
- bash .dev-tools/install-nginx-1.sh - bash .dev-tools/install-nginx-1.sh
- bash .dev-tools/run-curl-tests-1.sh - bash .dev-tools/run-curl-tests-1.sh
- bash .dev-tools/install-nginx-testing-of-changes.sh
- bash .dev-tools/run-curl-tests-testing-of-changes.sh
- bash .dev-tools/install-nginx-2.sh - bash .dev-tools/install-nginx-2.sh
- bash .dev-tools/run-curl-tests-2.sh - bash .dev-tools/run-curl-tests-2.sh
- bash .dev-tools/install-nginx-3.sh - bash .dev-tools/install-nginx-3.sh
- bash .dev-tools/run-curl-tests-3.sh - bash .dev-tools/run-curl-tests-3.sh
- bash .dev-tools/install-nginx-4.sh - bash .dev-tools/install-nginx-4.sh
- bash .dev-tools/run-curl-tests-4.sh - bash .dev-tools/run-curl-tests-4.sh
- bash .dev-tools/install-nginx-testing-of-changes.sh
- bash .dev-tools/run-curl-tests-testing-of-changes.sh
- bash .dev-tools/modify-files-and-commit.sh - bash .dev-tools/modify-files-and-commit.sh
before_deploy: before_deploy: