Fix Nginx Reloading in Build Tests / Debug Curl Tests

This commit is contained in:
Mitchell Krog 2019-06-20 14:04:00 +02:00
parent 58f42e63b6
commit f2f57eca50
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
5 changed files with 24 additions and 15 deletions

View file

@ -142,7 +142,7 @@ sudo bash ./update-ngxblocker -n
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# *******************************************************************************************
# Test that update-ngxblocker can install all missing required files by deleting some of them
@ -206,7 +206,7 @@ sudo bash ./setup-ngxblocker -x
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# *******************************************************
# Make sure we test latest generated globalblacklist.conf
@ -220,7 +220,7 @@ sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist.conf /etc/nginx/conf.d/global
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# **********************
# Now Run our Curl Tests

View file

@ -157,7 +157,7 @@ sudo bash ./update-ngxblocker -c /usr/local/nginx/conf.d -b /usr/local/nginx/bot
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# *******************************************************************************************
# Test that update-ngxblocker can install all missing required files by deleting some of them
@ -221,7 +221,7 @@ sudo bash ./setup-ngxblocker -x -c /usr/local/nginx/conf.d -b /usr/local/nginx/b
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# *******************************************************
# Make sure we test latest generated globalblacklist.conf
@ -243,7 +243,7 @@ sudo bash ./setup-ngxblocker -x -c /usr/local/nginx/conf.d -b /usr/local/nginx/b
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# **********************
# Now Run our Curl Tests

View file

@ -164,7 +164,7 @@ sudo bash ./update-ngxblocker -c /etc/nginx/myconf.d -b /etc/nginx/mybots.d -n
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# *******************************************************************************************
# Test that update-ngxblocker can install all missing required files by deleting some of them
@ -228,7 +228,7 @@ sudo bash ./setup-ngxblocker -x -c /etc/nginx/myconf.d -b /etc/nginx/mybots.d
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# *******************************************************
# Make sure we test latest generated globalblacklist.conf
@ -250,7 +250,7 @@ sudo bash ./setup-ngxblocker -x -c /etc/nginx/myconf.d -b /etc/nginx/mybots.d
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# **********************
# Now Run our Curl Tests

View file

@ -69,8 +69,7 @@ sudo add-apt-repository -y ppa:nginx/${mainstreamnginx}
sudo apt-get update
sudo apt-get install -y --assume-yes nginx-full
sudo nginx -V
sudo nginx -t
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# **************************************
# Make Sure We Cleanup From Nginx Test 3
@ -196,7 +195,7 @@ sudo bash ./update-ngxblocker -n
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# *******************************************************************************************
# Test that update-ngxblocker can install all missing required files by deleting some of them
@ -260,7 +259,7 @@ sudo bash ./setup-ngxblocker -x
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# *******************************************************
# Make sure we test latest generated globalblacklist.conf
@ -282,10 +281,10 @@ sudo bash ./setup-ngxblocker -x
# *********************
printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/default13.vhost /etc/nginx/sites-available/default.vhost
sudo service nginx reload
sudo nginx -t && sudo nginx -s reload
# **********************
# Now Run our Curl Tests

View file

@ -209,15 +209,25 @@ fi
# Trigger our curl functions to run
# *********************************
echo "Test 1"
run_curltest1
echo "Test 2"
run_curltest2
echo "Test 3"
run_curltest3
echo "Test 4"
run_curltest4
echo "Test 5"
run_curltest5
echo "Test 6"
run_curltest6
echo "Test 6"
run_curltest7
echo "Test 8"
run_curltest8
echo "Test 9"
run_curltest9
echo "Test 10"
run_curltest10
echo "Tests Completed"