From 464a436f8f2f4a3cf666bac7180de8920dd6ea89 Mon Sep 17 00:00:00 2001
From: Brian Coca <brian.coca+git@gmail.com>
Date: Wed, 12 Aug 2015 19:26:04 -0400
Subject: [PATCH] fixed testplay host, included lookup path tests in  all,
 added stage for easier debugging

---
 test/integration/Makefile                  |  2 +-
 test/integration/lookup_paths/play.yml     | 10 +++++-----
 test/integration/lookup_paths/testplay.yml |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/integration/Makefile b/test/integration/Makefile
index cde8c2ceb6..d35731956a 100644
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@@ -21,7 +21,7 @@ VAULT_PASSWORD_FILE = vault-password
 
 CONSUL_RUNNING := $(shell python consul_running.py)
 
-all: parsing test_var_precedence unicode test_templating_settings non_destructive destructive includes check_mode test_hash test_handlers test_group_by test_vault test_tags
+all: parsing test_var_precedence unicode test_templating_settings non_destructive destructive includes check_mode test_hash test_handlers test_group_by test_vault test_tags test_lookup_paths
 
 parsing:
 	ansible-playbook bad_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -vvv $(TEST_FLAGS) --tags prepare,common,scenario5
diff --git a/test/integration/lookup_paths/play.yml b/test/integration/lookup_paths/play.yml
index 29dafff9cc..80407bdbc9 100644
--- a/test/integration/lookup_paths/play.yml
+++ b/test/integration/lookup_paths/play.yml
@@ -8,7 +8,7 @@
     - copy: dest={{playbook_dir}}/roles/showfile/testfile content='in role'
     - copy: dest={{playbook_dir}}/files/testfile content='in files'
     - copy: dest={{playbook_dir}}/testfile content='in local'
-    - set_fact: role_out="in role files" play_out="in files"
+    - set_fact: role_out="in role files" play_out="in files" stage='setup'
 
 - include: testplay.yml
 
@@ -18,7 +18,7 @@
   gather_facts: false
   tasks:
     - file: path={{playbook_dir}}/roles/showfile/files/testfile state=absent
-    - set_fact: role_out="in role tasks" play_out="in files"
+    - set_fact: role_out="in role tasks" play_out="in files" stage='remove 1'
 
 - include: testplay.yml
 
@@ -28,7 +28,7 @@
   gather_facts: false
   tasks:
     - file: path={{playbook_dir}}/roles/showfile/tasks/testfile state=absent
-    - set_fact: role_out="in files" play_out="in files"
+    - set_fact: role_out="in files" play_out="in files" stage='remote 2'
 
 - include: testplay.yml
 
@@ -38,7 +38,7 @@
   gather_facts: false
   tasks:
     - file: path={{playbook_dir}}/roles/showfile/testfile state=absent
-    - set_fact: role_out="in files" play_out="in files"
+    - set_fact: role_out="in files" play_out="in files" stage='remove 3'
 
 - include: testplay.yml
 
@@ -48,7 +48,7 @@
   gather_facts: false
   tasks:
     - file: path={{playbook_dir}}/files/testfile state=absent
-    - set_fact: role_out="in local" play_out="in local"
+    - set_fact: role_out="in local" play_out="in local" stage='remove 4'
 
 - include: testplay.yml
 
diff --git a/test/integration/lookup_paths/testplay.yml b/test/integration/lookup_paths/testplay.yml
index 5ab7293d8a..8bf4be2c08 100644
--- a/test/integration/lookup_paths/testplay.yml
+++ b/test/integration/lookup_paths/testplay.yml
@@ -1,5 +1,5 @@
 - name: test initial state
-  hosts: localhost
+  hosts: testhost
   connection: local
   gather_facts: false
   roles:
@@ -8,7 +8,7 @@
     - name: from play
       set_fact: play_result="{{lookup('file', 'testfile')}}"
 
-    - name: output output
+    - name: output output {{stage}}
       debug: msg="play> {{play_out}}, role> {{role_out}}"
 
     - name: verify that result match expected