fixed reference to box variable.

Author: steenzout

tests/test_idempotence.sh

@@ -12,7 +12,7 @@
 #   - PLAYBOOK : the path to the Ansible playbook.
 #
 #   from <playbook_name>.sh
-#   - box : the name of the vagrant box
+#   - BOX : the name of the vagrant box
 #
 # optional variables:
 #
@@ -31,10 +31,10 @@ RED='\033[0;31m'
 # SGR code to set text color (foreground) to no color.
 NC='\033[0m'
 # the logfile to hold the output of the playbook run
-LOGFILE="log/${box}_${VIRTUALENV_NAME}.log"
+LOGFILE="log/${BOX}_${VIRTUALENV_NAME}.log"
 
-echo "[INFO] ${VIRTUALENV_NAME} running idempotence test..."
-ansible-playbook -i ${INVENTORY} --limit ${box} ${PLAYBOOK} 2>&1 | tee ${LOGFILE} | \
-    grep "${box}" | grep -q "${PASS_CRITERIA}" && \
-    echo -ne "[TEST] ${box} ${VIRTUALENV_NAME} idempotence : ${GREEN}PASS${NC}\n" || \
-    (echo -ne "[TEST] ${box} ${VIRTUALENV_NAME} idempotence : ${RED}FAILED${NC} ${PASS_CRITERIA}\n" && exit 1)
+echo "[INFO] #{BOX} ${VIRTUALENV_NAME} running idempotence test..."
+ansible-playbook -i ${INVENTORY} --limit ${BOX} ${PLAYBOOK} 2>&1 | tee ${LOGFILE} | \
+    grep "${BOX}" | grep -q "${PASS_CRITERIA}" && \
+    echo -ne "[TEST] ${BOX} ${VIRTUALENV_NAME} idempotence : ${GREEN}PASS${NC}\n" || \
+    (echo -ne "[TEST] ${BOX} ${VIRTUALENV_NAME} idempotence : ${RED}FAILED${NC} ${PASS_CRITERIA}\n" && exit 1)

tests/vagrant.sh

@@ -80,18 +80,18 @@ source ${VIRTUALENV}/bin/activate
 # force Ansible to ask for sudo password when running tests against Vagrant
 export ANSIBLE_ASK_SUDO_PASS=True
 
-for box in `grep vagrant.dev group_vars/all.yml | sed 's/://g'`
+for BOX in `grep vagrant.dev group_vars/all.yml | sed 's/://g'`
 do
 
     echo "[INFO] preparing ${box}..."
-    vagrant up ${box} 2> /dev/null
+    vagrant up ${BOX} 2> /dev/null
     if [ $? -ne 0 ]; then
         # box not enabled
         continue
     fi
 
     . test_idempotence.sh
 
-    echo "[INFO] destroying ${box}..."
-    vagrant destroy -f $box
+    echo "[INFO] destroying ${BOX}..."
+    vagrant destroy -f ${BOX}
 done