From 5896837fd6f8dba78fe26681538412b3a55ea5a6 Mon Sep 17 00:00:00 2001
From: steenzout <steenzout@ymail.com>
Date: Thu, 30 Apr 2015 14:13:15 -0600
Subject: [PATCH] uppercase BOX variable. uncomment INVENTORY variable. comment
 puts statements in Vagrantfile.

---
 tests/Vagrantfile         | 10 +++++-----
 tests/test_idempotence.sh |  2 +-
 tests/vagrant.sh          |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/Vagrantfile b/tests/Vagrantfile
index 45f57ed..e338620 100644
--- a/tests/Vagrantfile
+++ b/tests/Vagrantfile
@@ -7,16 +7,16 @@ CONFIGURATION_FILE = 'group_vars/all.yml'
 
 Vagrant.configure('2') do |config|
 
-  puts "[INFO] loading box settings from #{CONFIGURATION_FILE}..."
+  # puts "[DEBUG] loading box settings from #{CONFIGURATION_FILE}..."
   vagrant_environment = YAML.load_file(File.expand_path(CONFIGURATION_FILE, File.dirname(__FILE__)))
 
   vagrant_environment['vagrant'].each do |box_name, box_settings|
     if not box_settings['enabled']
-        puts "[INFO] #{box_name} is not enabled. skipping..."
+        # puts "[DEBUG] #{box_name} is not enabled. skipping..."
         next
     end
 
-    puts "[INFO] applying #{box_name} settings..."
+    # puts "[DEBUG] applying #{box_name} settings..."
     config.vm.define "#{box_name}" do |host|
 
       host.vm.box = box_settings['box'] unless not box_settings.key? 'box'
@@ -24,7 +24,7 @@ Vagrant.configure('2') do |config|
 
       host.vm.network box_settings['network']['name'], ip: box_settings['network']['ip'] unless box_settings.key? 'network'
 
-      puts "[INFO] applying virtualbox provider settings for #{box_name} box..."
+      # puts "[DEBUG] applying virtualbox provider settings for #{box_name} box..."
       config.vm.provider "#{box_settings['provider']}" do | provider |
         box_settings['provider'].each do |key, value|
           next if key == 'name'
@@ -32,7 +32,7 @@ Vagrant.configure('2') do |config|
         end
       end
 
-      puts "[INFO] provisioning #{box_name} using ansible vagrant playbook..."
+      # puts "[DEBUG] provisioning #{box_name} using ansible vagrant playbook..."
       config.vm.provision 'ansible' do |ansible|
         ansible.playbook = PLAYBOOK
         ansible.verbose = 'v'
diff --git a/tests/test_idempotence.sh b/tests/test_idempotence.sh
index 318ae7b..48255ff 100644
--- a/tests/test_idempotence.sh
+++ b/tests/test_idempotence.sh
@@ -33,7 +33,7 @@ NC='\033[0m'
 # the logfile to hold the output of the playbook run
 LOGFILE="log/${BOX}_${VIRTUALENV_NAME}.log"
 
-echo "[INFO] #{BOX} ${VIRTUALENV_NAME} running idempotence test..."
+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" || \
diff --git a/tests/vagrant.sh b/tests/vagrant.sh
index 2c7b855..eaf06e4 100644
--- a/tests/vagrant.sh
+++ b/tests/vagrant.sh
@@ -26,8 +26,8 @@ source environment.sh
 # NOTE: PLAYBOOK must be the same value as defined in the Vagrantfile.
 PLAYBOOK="vagrant.yml"
 
-# A default inventory file is automatically generated by Vagrant @
-#   INVENTORY=${DIR}/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
+# Inventory file to run tests againt (points to Vagrant generated inventory)
+INVENTORY=${DIR}/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
 
 
 while [[ $# > 1 ]]
@@ -83,7 +83,7 @@ export ANSIBLE_ASK_SUDO_PASS=True
 for BOX in `grep vagrant.dev group_vars/all.yml | sed 's/://g'`
 do
 
-    echo "[INFO] preparing ${box}..."
+    echo "[INFO] preparing ${BOX}..."
     vagrant up ${BOX} 2> /dev/null
     if [ $? -ne 0 ]; then
         # box not enabled
@@ -92,6 +92,6 @@ do
 
     . test_idempotence.sh
 
-    echo "[INFO] destroying ${BOX}..."
+    echo "[INFO] destroy ${BOX}..."
     vagrant destroy -f ${BOX}
 done