From bcbeba83b5f2f41caaa016fe846c8a262fea952e Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Thu, 20 Jun 2019 13:19:32 +0200
Subject: [PATCH] Fix testing of test list Ref: #264

---
 .dev-tools/install-nginx-testing-of-changes.sh  | 13 +++----------
 .dev-tools/run-curl-tests-testing-of-changes.sh |  4 +++-
 .travis.yml                                     |  4 ++--
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.dev-tools/install-nginx-testing-of-changes.sh b/.dev-tools/install-nginx-testing-of-changes.sh
index 3f332fb00..a12cceb90 100644
--- a/.dev-tools/install-nginx-testing-of-changes.sh
+++ b/.dev-tools/install-nginx-testing-of-changes.sh
@@ -41,9 +41,9 @@
 
 # Run testing of test version
 
-# *******************************************************
-# Make sure we test latest generated globalblacklist.conf
-# *******************************************************
+# ***********************************************************************
+# Make sure we test latest generated globalblacklist-testing-version.conf
+# ***********************************************************************
 
 printf '\n%s\n%s\n%s\n\n' "##############################################################################" "Copy latest generated globalblacklist.conf file to test for any compile errors" "##############################################################################"
 sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/nginx/conf.d/globalblacklist.conf
@@ -55,13 +55,6 @@ sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/ngi
 printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################"
 sudo service nginx reload
 
-sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/default13.vhost /etc/nginx/sites-available/default.vhost
-sudo service nginx reload
-
-sudo systemctl enable nginx
-sudo systemctl start nginx
-sudo systemctl reload nginx
-
 # **********************
 # Now Run our Curl Tests
 # **********************
diff --git a/.dev-tools/run-curl-tests-testing-of-changes.sh b/.dev-tools/run-curl-tests-testing-of-changes.sh
index 855bc2c53..a54b78f8d 100644
--- a/.dev-tools/run-curl-tests-testing-of-changes.sh
+++ b/.dev-tools/run-curl-tests-testing-of-changes.sh
@@ -20,6 +20,8 @@
 # Set Location of our Curl Test Results Files
 # *******************************************
 
+echo "Tests Starting"
+
 _curltest1=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest1.txt
 _curltest2=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest2.txt
 _curltest3=${TRAVIS_BUILD_DIR}/.dev-tools/_curl_tests_changetesting/curltest3.txt
@@ -187,7 +189,7 @@ fi
 }
 
 # **************************************************
-# Function Curl Test 9 - Check for Bad Bot "Nutch"
+# Function Curl Test 10 - Check for Bad Bot "Nutch"
 # **************************************************
 
 run_curltest10 () {
diff --git a/.travis.yml b/.travis.yml
index d6f6cd96c..b7c08aef0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,14 +40,14 @@ script:
   - bash .dev-tools/generate-files.sh
   - bash .dev-tools/install-nginx-1.sh
   - bash .dev-tools/run-curl-tests-1.sh
+  - bash .dev-tools/install-nginx-testing-of-changes.sh
+  - bash .dev-tools/run-curl-tests-testing-of-changes.sh
   - bash .dev-tools/install-nginx-2.sh
   - bash .dev-tools/run-curl-tests-2.sh
   - bash .dev-tools/install-nginx-3.sh
   - bash .dev-tools/run-curl-tests-3.sh
   - bash .dev-tools/install-nginx-4.sh
   - bash .dev-tools/run-curl-tests-4.sh
-  - bash .dev-tools/install-nginx-testing-of-changes.sh
-  - bash .dev-tools/run-curl-tests-testing-of-changes.sh
   - bash .dev-tools/modify-files-and-commit.sh
 
 before_deploy: