Reduce sleep times on tests

This commit is contained in:
Mitchell Krog 2019-06-26 11:46:44 +02:00
parent b2e1043937
commit 5916da2f24
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
7 changed files with 16 additions and 14 deletions

View file

@ -10,8 +10,8 @@
### VERSION INFORMATION # ### VERSION INFORMATION #
################################################### ###################################################
### Version: V3.2019.06.1621 ### Version: V3.2019.06.1611
### Updated: Wed Jun 26 11:37:07 SAST 2019 ### Updated: Wed Jun 26 09:35:19 SAST 2019
### Bad Referrer Count: 6713 ### Bad Referrer Count: 6713
### Bad Bot Count: 556 ### Bad Bot Count: 556
################################################### ###################################################
@ -10631,7 +10631,7 @@ geo $ratelimited {
# this rate limiting will only take effect if you change any of the bots and change # this rate limiting will only take effect if you change any of the bots and change
# their block value from 1 to 2. # their block value from 1 to 2.
limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m; limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
limit_req_zone $bot_iplimit zone=bot2_reqlimitip:16m rate=6r/m burst=1; limit_req_zone $bot_iplimit zone=bot2_reqlimitip:16m rate=2r/s;
### *** MAKE SURE TO ADD to your nginx.conf *** ### *** MAKE SURE TO ADD to your nginx.conf ***
### server_names_hash_bucket_size 64; ### server_names_hash_bucket_size 64;

View file

@ -48,10 +48,10 @@ sudo nginx -t && sudo nginx -s reload
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
printf "\n\n" printf "\n\n"
sleep 30s sleep 10s
# ******************************************************* # *******************************************************
# Function Curl Test 1 - Test User Whitelist for "Nutch" # Function Curl Test 1 - Test User Whitelist for "Nutch"

View file

@ -47,10 +47,10 @@ printf "\n\n"
sudo nginx -t && sudo nginx -s reload sudo nginx -t && sudo nginx -s reload
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
printf "\n\n" printf "\n\n"
sleep 30s sleep 10s
echo "${bold}${green}--------------" echo "${bold}${green}--------------"
echo "${bold}${green}Tests Starting" echo "${bold}${green}Tests Starting"

View file

@ -48,10 +48,10 @@ sudo nginx -t && sudo nginx -s reload
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
printf "\n\n" printf "\n\n"
sleep 30s sleep 10s
# ************************************************* # *************************************************
# Function Curl Test 1 - Test User Domain Whitelist # Function Curl Test 1 - Test User Domain Whitelist

View file

@ -46,6 +46,7 @@ printf "\n\n"
sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf
printf '%s\t%s\n' "${thisip}" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf printf '%s\t%s\n' "${thisip}" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf
printf '%s\t%s\n' "127.0.0.1" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf
sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf /etc/nginx/bots.d/blacklist-ips.conf sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf /etc/nginx/bots.d/blacklist-ips.conf
echo "${bold}${green}--------------------" echo "${bold}${green}--------------------"
@ -55,6 +56,7 @@ printf "\n\n"
sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf
printf '%s\t%s\n' "${thisip}" "0;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf printf '%s\t%s\n' "${thisip}" "0;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf
printf '%s\t%s\n' "127.0.0.1" "0;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf
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/whitelist-ips.conf /etc/nginx/bots.d/whitelist-ips.conf
echo "${bold}${green}---------------" echo "${bold}${green}---------------"
@ -65,10 +67,10 @@ sudo nginx -t && sudo nginx -s reload
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
printf "\n\n" printf "\n\n"
#sleep 30s sleep 10s
# ************************************************* # *************************************************
# Function Curl Test 1 - Test User Domain Whitelist # Function Curl Test 1 - Test User Domain Whitelist

View file

@ -134,7 +134,7 @@ sudo nginx -t && sudo nginx -s reload
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
printf "\n\n" printf "\n\n"
sleep 10s sleep 10s

View file

@ -59,10 +59,10 @@ printf "\n\n"
sudo nginx -t && sudo nginx -s reload sudo nginx -t && sudo nginx -s reload
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
echo "${bold}${yellow}-----------------------------------------------------------------------" echo "${bold}${yellow}-----------------------------------------------------------------------"
printf "\n\n" printf "\n\n"
sleep 30s sleep 10s
echo "${bold}${green}--------------" echo "${bold}${green}--------------"
echo "${bold}${green}Tests Starting" echo "${bold}${green}Tests Starting"