From aeecdbfc3528d4a16218029982b2e4abf84fff10 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Thu, 3 May 2018 13:50:21 -0500
Subject: [PATCH] Restore previous test play, break new tests into a new play
 (#39688)

---
 .../include_import/role/test_include_role.yml | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/test/integration/targets/include_import/role/test_include_role.yml b/test/integration/targets/include_import/role/test_include_role.yml
index f9ea65a6e81..71f4f0c9527 100644
--- a/test/integration/targets/include_import/role/test_include_role.yml
+++ b/test/integration/targets/include_import/role/test_include_role.yml
@@ -1,5 +1,5 @@
 - name: Test include_role
-  hosts: testhost,testhost2
+  hosts: testhost
 
   vars:
     run_role: yes
@@ -85,27 +85,10 @@
       include_role:
         name: "{{ role_name }}"
 
-    - name: wipe role results
-      set_fact:
-        _role2_result: ~
-        _role3_result: ~
-
     - name: Test using a host variable for role name
       include_role:
         name: "{{ host_var_role_name }}"
 
-    - name: assert that host varible for role name calls 2 diff roles
-      assert:
-        that:
-          - _role2_result is not none
-      when: inventory_hostname == 'testhost2'
-
-    - name: assert that host varible for role name calls 2 diff roles
-      assert:
-        that:
-          - _role3_result is not none
-      when: inventory_hostname == 'testhost'
-
     - name: Pass variable to role
       include_role:
         name: role1
@@ -161,3 +144,26 @@
         - name: Include role inside always
           include_role:
             name: role3
+
+- hosts: testhost,testhost2
+  tasks:
+    - name: wipe role results
+      set_fact:
+        _role2_result: ~
+        _role3_result: ~
+
+    - name: Test using a host variable for role name
+      include_role:
+        name: "{{ host_var_role_name }}"
+
+    - name: assert that host varible for role name calls 2 diff roles
+      assert:
+        that:
+          - _role2_result is not none
+      when: inventory_hostname == 'testhost2'
+
+    - name: assert that host varible for role name calls 2 diff roles
+      assert:
+        that:
+          - _role3_result is not none
+      when: inventory_hostname == 'testhost'