From fe577df1c36f5630bde7525520ee3ff8d2cf5cc9 Mon Sep 17 00:00:00 2001
From: ronivay <roni@vayrynen.info>
Date: Fri, 10 Aug 2018 17:48:39 +0300
Subject: [PATCH] Test update functionality along with installation

---
 tests/CentOS/Vagrantfile |  4 +--
 tests/Debian/Vagrantfile |  4 +--
 tests/Ubuntu/Vagrantfile |  4 +--
 tests/run-tests.sh       | 61 +++++++++++++++++++++++++++++++++-------
 4 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/tests/CentOS/Vagrantfile b/tests/CentOS/Vagrantfile
index c80be70..8291c10 100644
--- a/tests/CentOS/Vagrantfile
+++ b/tests/CentOS/Vagrantfile
@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
   #
   # Run automated test installation
   #
-  config.vm.provision :shell, path: "../../xo-install.sh", args: "--install", run: 'always'
-
+  config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never"
+  config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never"
 end
diff --git a/tests/Debian/Vagrantfile b/tests/Debian/Vagrantfile
index 02894a1..7237299 100644
--- a/tests/Debian/Vagrantfile
+++ b/tests/Debian/Vagrantfile
@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
   #
   # Run automated test installation
   #
-  config.vm.provision :shell, path: "../../xo-install.sh", args: "--install", run: 'always'
-
+  config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never"
+  config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never"
 end
diff --git a/tests/Ubuntu/Vagrantfile b/tests/Ubuntu/Vagrantfile
index 4781280..4cf022c 100644
--- a/tests/Ubuntu/Vagrantfile
+++ b/tests/Ubuntu/Vagrantfile
@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
   #
   # Run automated test installation
   #
-  config.vm.provision :shell, path: "../../xo-install.sh", args: "--install", run: 'always'
-
+  config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never"
+  config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never"
 end
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 4df658d..48138ad 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -4,19 +4,40 @@ function RunTestsSingle {
 
 	export VAGRANT_CWD="$(dirname $0)/$1"
 	local LOGFILE="$(dirname $0)/$1/installation-test.log"
-	vagrant up &> $LOGFILE
+	vagrant up --no-provision &> $LOGFILE
+
+	if [[ $? == "1" ]]; then
+		echo "Vagrant box failed to start, exiting"
+		exit 1;
+	fi
+
+	vagrant provision --provision-with install >> $LOGFILE 2>&1
 	sleep 5
 	echo "" >> $LOGFILE
-	echo "Curl output:" >> $LOGFILE
+	echo "Curl output after install:" >> $LOGFILE
 	curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false
 
 	if [[ $? == "1" ]]; then
-	echo "$1 HTTP Check: failed"
+	echo "$1 install HTTP Check: failed"
 	else
-		echo "$1 HTTP Check: success"
+		echo "$1 install HTTP Check: success"
 	fi
 	sleep 5
-	vagrant destroy -f &> $LOGFILE
+
+	vagrant provision --provision-with update >> $LOGFILE 2>&1
+        sleep 5
+        echo "" >> $LOGFILE
+        echo "Curl output after update:" >> $LOGFILE
+        curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false
+
+        if [[ $? == "1" ]]; then
+        echo "$1 update HTTP Check: failed"
+        else
+                echo "$1 update HTTP Check: success"
+        fi
+        sleep 5
+
+	vagrant destroy -f >> $LOGFILE 2>&1
 	unset VAGRANT_CWD
 
 }
@@ -27,19 +48,39 @@ for x in CentOS Debian Ubuntu; do
 
 	export VAGRANT_CWD="$(dirname $0)/$x"
 	local LOGFILE="$(dirname $0)/$x/installation-test.log"
-	vagrant up &> $LOGFILE
+	vagrant up --no-provision &> $LOGFILE
+
+	if [[ $? == "1" ]]; then
+		echo "Vagrant box failed to start, exiting"
+		exit 1;
+	fi
+	
+	vagrant provision --provision-with install >> $LOGFILE 2>&1
 	sleep 5
 	echo "" >> $LOGFILE
-	echo "Curl output:" >> $LOGFILE
+	echo "Curl output after install:" >> $LOGFILE
 	curl -s -L -m 5 192.168.33.101 >> $LOGFILE 2>&1 || false
 	
 	if [[ $? == "1" ]]; then
-		echo "$x HTTP Check: failed"
+		echo "$x install HTTP Check: failed"
 	else
-		echo "$x HTTP Check: success"
+		echo "$x install HTTP Check: success"
 	fi
 	sleep 5
-	vagrant destroy -f &> $LOGFILE
+
+	vagrant provision --provision-with update >> $LOGFILE 2>&1
+	sleep 5
+	echo "" >> $LOGFILE
+	echo "Curl output after update:" >> $LOGFILE
+	curl -s -L -m 5 192.168.33.101 >> $LOGFILE 2>&1 || false
+
+	if [[ $? == "1" ]]; then
+		echo "$x update HTTP Check: failed"
+	else
+		echo "$x update HTTP Check: success"
+	fi
+
+	vagrant destroy -f >> $LOGFILE 2>&1
 	unset VAGRANT_CWD
 done