From 29f2e78afa5092633ef1062cd781c36fe2dc3d18 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Thu, 27 Jun 2019 15:43:59 +0200 Subject: [PATCH] [V4] Fix beta tests --- .../beta-install-nginx-testing-of-changes.sh | 19 +++++++++++++++++++ .dev-tools/beta-test-blocker.sh | 1 + 2 files changed, 20 insertions(+) diff --git a/.dev-tools/beta-install-nginx-testing-of-changes.sh b/.dev-tools/beta-install-nginx-testing-of-changes.sh index 0ae1e776f..4dad9a5a3 100644 --- a/.dev-tools/beta-install-nginx-testing-of-changes.sh +++ b/.dev-tools/beta-install-nginx-testing-of-changes.sh @@ -55,6 +55,25 @@ cyan=$(tput setaf 6) white=$(tput setaf 7) defaultcolor=$(tput setaf default) +printf "\n" +echo "${bold}${yellow}-----------------------------------" +echo "${bold}${yellow}Delete Files to force fresh testing" +echo "${bold}${yellow}-----------------------------------" +printf "\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/ + +printf "\n" +echo "${bold}${magenta}-------------------------" +echo "${bold}${magenta}Execute update-ngxblocker" +echo "${bold}${magenta}-------------------------" +printf "\n" +cd /usr/sbin +sudo bash ./update-ngxblocker -n + + # *********************************************************************** # Make sure we test latest generated globalblacklist-testing-version.conf # *********************************************************************** diff --git a/.dev-tools/beta-test-blocker.sh b/.dev-tools/beta-test-blocker.sh index b36dcb2d1..e7f1f721b 100755 --- a/.dev-tools/beta-test-blocker.sh +++ b/.dev-tools/beta-test-blocker.sh @@ -62,6 +62,7 @@ if curl -v -A "80legs" http://localhost:9000 2>&1 | grep -i '(52)'; then echo "${bold}${green}PASSED - ${red}80legs BAD BOT DETECTED" else echo "${bold}${red}FAILED - ${red}80legs BAD BOT NOT DETECTED" + curl -v -A "80legs" http://localhost:9000 2>&1 exit 1 fi }