From c03afccc053bf4d9ecd729ca34d0817c4e71c97f Mon Sep 17 00:00:00 2001
From: Brian Coca <brian.coca+git@gmail.com>
Date: Tue, 1 Dec 2015 21:11:12 -0800
Subject: [PATCH] reformated test, changed big assert to with_items

much easier to see the individual condition that causes the failure
when using with_items and evaluating each part of the assert individually
---
 test/integration/test_var_precedence.yml | 66 ++++++++++++------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/test/integration/test_var_precedence.yml b/test/integration/test_var_precedence.yml
index ae4b4cfea1..df09914158 100644
--- a/test/integration/test_var_precedence.yml
+++ b/test/integration/test_var_precedence.yml
@@ -1,43 +1,45 @@
 ---
 - hosts: testhost
   vars:
-  - vars_var: "vars_var"
-  - param_var: "BAD!"
-  - vars_files_var: "BAD!"
-  - extra_var_override_once_removed: "{{ extra_var_override }}"
-  - from_inventory_once_removed: "{{ inven_var | default('BAD!') }}"
+    - ansible_hostname: "BAD!"
+    - vars_var: "vars_var"
+    - param_var: "BAD!"
+    - vars_files_var: "BAD!"
+    - extra_var_override_once_removed: "{{ extra_var_override }}"
+    - from_inventory_once_removed: "{{ inven_var | default('BAD!') }}"
   vars_files:
-  - vars/test_var_precedence.yml
+    - vars/test_var_precedence.yml
   roles:
-  - { role: test_var_precedence, param_var: "param_var" }
+    - { role: test_var_precedence, param_var: "param_var" }
   tasks:
-  - name: register a result
-    command: echo 'BAD!'
-    register: registered_var
-  - name: use set_fact to override the registered_var
-    set_fact: registered_var="this is from set_fact"
-  - debug: var=extra_var
-  - debug: var=extra_var_override_once_removed
-  - debug: var=vars_var
-  - debug: var=vars_files_var
-  - debug: var=vars_files_var_role
-  - debug: var=registered_var
-  - debug: var=from_inventory_once_removed
-  - assert:
-      that:
-        - 'extra_var == "extra_var"'
-        - 'extra_var_override == "extra_var_override"'
-        - 'extra_var_override_once_removed == "extra_var_override"'
-        - 'vars_var == "vars_var"'
-        - 'vars_files_var == "vars_files_var"'
-        - 'vars_files_var_role == "vars_files_var_role3"'
-        - 'registered_var == "this is from set_fact"'
-        - 'from_inventory_once_removed == "inventory_var"'
+    - name: register a result
+      command: echo 'BAD!'
+      register: registered_var
+    - name: use set_fact to override the registered_var
+      set_fact: registered_var="this is from set_fact"
+    - debug: var=extra_var
+    - debug: var=extra_var_override_once_removed
+    - debug: var=vars_var
+    - debug: var=vars_files_var
+    - debug: var=vars_files_var_role
+    - debug: var=registered_var
+    - debug: var=from_inventory_once_removed
+    - assert:
+        that: item
+      with_items:
+          - 'extra_var == "extra_var"'
+          - 'extra_var_override == "extra_var_override"'
+          - 'extra_var_override_once_removed == "extra_var_override"'
+          - 'vars_var == "vars_var"'
+          - 'vars_files_var == "vars_files_var"'
+          - 'vars_files_var_role == "vars_files_var_role3"'
+          - 'registered_var == "this is from set_fact"'
+          - 'from_inventory_once_removed == "inventory_var"'
 
 - hosts: inven_overridehosts
   vars_files:
-  - "test_var_precedence.yml"
+    - "test_var_precedence.yml"
   roles:
-  - role: test_var_precedence_inven_override
-    foo: bar
+    - role: test_var_precedence_inven_override
+      foo: bar