From fe5a7bcabfa6aa19f9349b2d5e4264c695c2af27 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Fri, 10 Oct 2014 12:45:33 -0500
Subject: [PATCH] Fixing bad variable naming choices

---
 test/integration/roles/test_conditionals/tasks/main.yml | 6 +++---
 test/integration/roles/test_conditionals/vars/main.yml  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/integration/roles/test_conditionals/tasks/main.yml b/test/integration/roles/test_conditionals/tasks/main.yml
index 136e9501ea7..3d3c2ec9de0 100644
--- a/test/integration/roles/test_conditionals/tasks/main.yml
+++ b/test/integration/roles/test_conditionals/tasks/main.yml
@@ -269,8 +269,8 @@
 
 - name: test a with_items loop using a variable with a missing attribute
   debug: var=item
-  with_items: foo.results
-  when: foo is defined and 'results' in foo
+  with_items: cond_bad_attribute.results
+  when: cond_bad_attribute is defined and 'results' in cond_bad_attribute
   register: result
 
 - name: assert the task was skipped
@@ -281,7 +281,7 @@
 
 - name: test a with_items loop skipping a single item
   debug: var=item
-  with_items: items.results
+  with_items: cond_list_of_items.results
   when: item != 'b'
   register: result
 
diff --git a/test/integration/roles/test_conditionals/vars/main.yml b/test/integration/roles/test_conditionals/vars/main.yml
index dddcfc59983..a6ecf62f534 100644
--- a/test/integration/roles/test_conditionals/vars/main.yml
+++ b/test/integration/roles/test_conditionals/vars/main.yml
@@ -2,10 +2,10 @@
 # foo is a dictionary that will be used to check that
 # a conditional passes a with_items loop on a variable
 # with a missing attribute (ie. foo.results)
-foo:
+cond_bad_attribute:
   bar: a
 
-items:
+cond_list_of_items:
   results:
   - a
   - b