From 3e13dfd7e8fe45a453127687b2f3af5f8e56a682 Mon Sep 17 00:00:00 2001
From: Brian Coca <brian.coca+git@gmail.com>
Date: Tue, 25 Aug 2015 00:40:57 -0400
Subject: [PATCH] used stdoutlines list to avoid string mismatches added block
 environment test

---
 test/integration/test_environment.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/test/integration/test_environment.yml b/test/integration/test_environment.yml
index 1d0b3dcd816..ce8d0ed4355 100644
--- a/test/integration/test_environment.yml
+++ b/test/integration/test_environment.yml
@@ -12,7 +12,7 @@
     - name: assert no val in stdout
       assert:
         that:
-            - '"val1" not in test_env.stdout'
+            - '"val1" not in test_env.stdout_lines'
 
     - name: check that envvar does exist
       shell: echo $key1
@@ -22,7 +22,7 @@
     - name: assert val1 in stdout
       assert:
         that:
-            - '"val1" in test_env2.stdout'
+            - '"val1" in test_env2.stdout_lines'
 
 - hosts: testhost
   tasks:
@@ -41,7 +41,7 @@
     - name: assert val1 in stdout
       assert:
         that:
-            - '"val1" in test_env3.stdout'
+            - '"val1" in test_env3.stdout_lines'
 
     - name: check that task envvar does exist
       shell: echo $key1; echo $other1
@@ -51,6 +51,19 @@
     - name: assert all vars appear as expected
       assert:
         that:
-            - '"val1" not in test_env4.stdout'
-            - '"not1" in test_env4.stdout'
-            - '"val2" in test_env4.stdout'
+            - '"val1" not in test_env4.stdout_lines'
+            - '"not1" in test_env4.stdout_lines'
+            - '"val2" in test_env4.stdout_lines'
+
+    - block:
+        - name: check that task envvar does exist in block
+          shell: echo $key1; echo $other1
+          register: test_env5
+
+        - name: assert all vars appear as expected in block
+          assert:
+            that:
+                - '"val1" not in test_env5.stdout_lines'
+                - '"not1" in test_env5.stdout_lines'
+                - '"val2" in test_env5.stdout_lines'
+      environment: "{{test2}}"