From 9be840b3d65284fe6362d253da0a5b9ba05f794f Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Mon, 24 Jun 2019 14:29:43 +0200 Subject: [PATCH] Cleanup Testing Template --- .dev-tools/banner.txt | 11 ----------- .dev-tools/globalblacklist-testing.template | 7 ------- .dev-tools/test-blocker-quick.sh | 6 +++--- .dev-tools/test-blocker.sh | 6 +++--- 4 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 .dev-tools/banner.txt diff --git a/.dev-tools/banner.txt b/.dev-tools/banner.txt deleted file mode 100644 index 15b0383ca..000000000 --- a/.dev-tools/banner.txt +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# _ __ _ # -# / |/ /__ _(_)__ __ __ # -# / / _ `/ / _ \\ \ / # -# /_/|_/\_, /_/_//_/_\_\ # -# __/___/ __ ___ __ ___ __ __ # -# / _ )___ ____/ / / _ )___ / /_ / _ )/ /__ ____/ /_____ ____ # -# / _ / _ `/ _ / / _ / _ \/ __/ / _ / / _ \/ __/ '_/ -_) __/ # -# /____/\_,_/\_,_/ /____/\___/\__/ /____/_/\___/\__/_/\_\\__/_/ # -# # -############################################################################## diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template index d894febf4..fba13025b 100644 --- a/.dev-tools/globalblacklist-testing.template +++ b/.dev-tools/globalblacklist-testing.template @@ -135,7 +135,6 @@ map $http_user_agent $bad_bot { # Bad User-Agent Strings That We Block Outright # ********************************************* - # START BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### "~*(?:\b)360Spider(?:\b|)" 3; "~*(?:\b)404checker(?:\b|)" 3; @@ -698,10 +697,6 @@ map $http_user_agent $bad_bot { # Allow Good User-Agent Strings We Know and Trust # *********************************************** -# TEST CASES -# ********** - #"~*(?:\b)Mozilla(?:|\s|,|\.|\b|\/|)" 0; - # START GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### "~*\badidxbot\b" 0; "~*\bAdsBot-Google\b" 0; @@ -777,8 +772,6 @@ map $http_user_agent $bad_bot { "~*\bYandexImages\b" 2; # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### - - } diff --git a/.dev-tools/test-blocker-quick.sh b/.dev-tools/test-blocker-quick.sh index 6ecba6505..5a2d70d1c 100755 --- a/.dev-tools/test-blocker-quick.sh +++ b/.dev-tools/test-blocker-quick.sh @@ -46,9 +46,9 @@ echo "${bold}${green}---------------" printf "\n\n" sudo nginx -t && sudo nginx -s reload -echo "${bold}${yellow}--------------------------------------------------------------------" -echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx Properly Reload inside Travis" -echo "${bold}${yellow}--------------------------------------------------------------------" +echo "${bold}${yellow}-----------------------------------------------------------------------" +echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" +echo "${bold}${yellow}-----------------------------------------------------------------------" printf "\n\n" sleep 30s diff --git a/.dev-tools/test-blocker.sh b/.dev-tools/test-blocker.sh index 2bdc63101..944f2fd87 100755 --- a/.dev-tools/test-blocker.sh +++ b/.dev-tools/test-blocker.sh @@ -46,9 +46,9 @@ echo "${bold}${green}---------------" printf "\n\n" sudo nginx -t && sudo nginx -s reload -echo "${bold}${yellow}--------------------------------------------------------------------" -echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx Properly Reload inside Travis" -echo "${bold}${yellow}--------------------------------------------------------------------" +echo "${bold}${yellow}-----------------------------------------------------------------------" +echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" +echo "${bold}${yellow}-----------------------------------------------------------------------" printf "\n\n" sleep 30s