From 472f476b21cd7955ff3f65a428850d5b85b7545d Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Thu, 27 Jun 2019 13:56:12 +0200
Subject: [PATCH] TEST new template REF: #201

---
 .dev-tools/test-blocker-whitelist-ips.sh | 13 +++---
 .dev-tools/test-blocker.sh               | 50 ++++++++++++------------
 .travis.yml                              |  1 +
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/.dev-tools/test-blocker-whitelist-ips.sh b/.dev-tools/test-blocker-whitelist-ips.sh
index 855b0b920..bd56782b3 100755
--- a/.dev-tools/test-blocker-whitelist-ips.sh
+++ b/.dev-tools/test-blocker-whitelist-ips.sh
@@ -60,13 +60,14 @@ printf '%s\t%s\n' "127.0.0.1" "0;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/
 sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf /etc/nginx/bots.d/whitelist-ips.conf
 
 sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/botblocker-nginx-settings.conf /etc/nginx/conf.d/botblocker-nginx-settings.conf
-printf "\n"
-echo "${bold}${yellow}---------------------------------------------------"
-echo "${bold}${yellow}Copy Test Unit of globalblacklist.conf file to test"
-echo "${bold}${yellow}---------------------------------------------------"
-printf "\n"
 
-sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/nginx/conf.d/globalblacklist.conf
+#printf "\n"
+#echo "${bold}${yellow}---------------------------------------------------"
+#echo "${bold}${yellow}Copy Test Unit of globalblacklist.conf file to test"
+#echo "${bold}${yellow}---------------------------------------------------"
+#printf "\n"
+
+#sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/nginx/conf.d/globalblacklist.conf
 
 
 echo "${bold}${green}---------------"
diff --git a/.dev-tools/test-blocker.sh b/.dev-tools/test-blocker.sh
index 400fb0a7f..c84477712 100755
--- a/.dev-tools/test-blocker.sh
+++ b/.dev-tools/test-blocker.sh
@@ -34,35 +34,35 @@ defaultcolor=$(tput setaf default)
 # Set Location of our Curl Test Results Files
 # *******************************************
 
-echo "${bold}${green}------------------------------------------------"
-echo "${bold}${green}Disable any User Whitelisting and set to Default"
-echo "${bold}${green}------------------------------------------------"
-printf "\n\n"
+#echo "${bold}${green}------------------------------------------------"
+#echo "${bold}${green}Disable any User Whitelisting and set to Default"
+#echo "${bold}${green}------------------------------------------------"
+#printf "\n\n"
 
-sudo rm /etc/nginx/conf.d/*.conf
-sudo rm /etc/nginx/bots.d/*.conf
-ls -la /etc/nginx/conf.d/
-ls -la /etc/nginx/bots.d/
+#sudo rm /etc/nginx/conf.d/*.conf
+#sudo rm /etc/nginx/bots.d/*.conf
+#ls -la /etc/nginx/conf.d/
+#ls -la /etc/nginx/bots.d/
 
-printf "\n"
-echo "${bold}${magenta}-------------------------"
-echo "${bold}${magenta}Execute update-ngxblocker"
-echo "${bold}${magenta}-------------------------"
-printf "\n"
-cd /usr/sbin
-sudo bash ./update-ngxblocker -n
+#printf "\n"
+#echo "${bold}${magenta}-------------------------"
+#echo "${bold}${magenta}Execute update-ngxblocker"
+#echo "${bold}${magenta}-------------------------"
+#printf "\n"
+#cd /usr/sbin
+#sudo bash ./update-ngxblocker -n
 
-echo "${bold}${green}---------------"
-echo "${bold}${green}Reloading Nginx"
-echo "${bold}${green}---------------"
-printf "\n\n"
-sudo nginx -t && sudo nginx -s reload
+#echo "${bold}${green}---------------"
+#echo "${bold}${green}Reloading Nginx"
+#echo "${bold}${green}---------------"
+#printf "\n\n"
+#sudo nginx -t && sudo nginx -s reload
 
-echo "${bold}${yellow}-----------------------------------------------------------------------"
-echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
-echo "${bold}${yellow}-----------------------------------------------------------------------"
-printf "\n\n"
-sleep 10s
+#echo "${bold}${yellow}-----------------------------------------------------------------------"
+#echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
+#echo "${bold}${yellow}-----------------------------------------------------------------------"
+#printf "\n\n"
+#sleep 10s
 
 echo "${bold}${green}--------------"
 echo "${bold}${green}Tests Starting"
diff --git a/.travis.yml b/.travis.yml
index 4a5d0fbf7..ceb07923d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,7 @@ script:
   #- bash .dev-tools/test-blocker-quick.sh
   #- bash .dev-tools/install-nginx-4.sh
   #- bash .dev-tools/test-blocker-quick.sh
+  # FROM HERE WE TEST ANY NEW CHANGES TO THE BLOCKER
   - bash .dev-tools/install-nginx-testing-of-changes.sh
   - bash .dev-tools/test-blocker.sh
   - bash .dev-tools/test-blocker-badwords.sh