From e88934e1d7967d4d31e5e6d9c3862f13d41c4126 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Wed, 3 Feb 2016 18:42:06 -0500
Subject: [PATCH] Tweak block integration tests to also test the free strategy

---
 test/integration/Makefile             | 8 ++++++--
 test/integration/test_blocks/main.yml | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/integration/Makefile b/test/integration/Makefile
index 8dcc92b532c..e2da6f46fa8 100644
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@@ -107,9 +107,13 @@ test_tags:
 blocks:
 	# remove old output log
 	rm -f block_test.out
-	# run test
+	# run the test and check to make sure the right number of completions was logged
 	ansible-playbook -vv test_blocks/main.yml | tee block_test.out
-	# ensure each test ran
+	[ "$$(grep 'TEST COMPLETE' block_test.out | wc -l)" == "$$(egrep '^[0-9]+ plays in' block_test.out | cut -f1 -d' ')" ]
+	# cleanup the output log again, to make sure the test is clean
+	rm -f block_test.out
+	# run test with free strategy and again count the completions
+	ansible-playbook -vv test_blocks/main.yml -e test_strategy=free | tee block_test.out
 	[ "$$(grep 'TEST COMPLETE' block_test.out | wc -l)" == "$$(egrep '^[0-9]+ plays in' block_test.out | cut -f1 -d' ')" ]
 
 cloud: amazon rackspace azure
diff --git a/test/integration/test_blocks/main.yml b/test/integration/test_blocks/main.yml
index 1e0641ba00a..cb6fc66600e 100644
--- a/test/integration/test_blocks/main.yml
+++ b/test/integration/test_blocks/main.yml
@@ -1,6 +1,7 @@
 - name: simple block test
   hosts: localhost
   gather_facts: yes
+  strategy: "{{test_strategy|default('linear')}}"
   vars:
     block_tasks_run: false
     block_rescue_run: false
@@ -60,6 +61,7 @@
 - name: block with includes
   hosts: localhost
   gather_facts: yes
+  strategy: "{{test_strategy|default('linear')}}"
   vars:
     rescue_run_after_include_fail: false
     always_run_after_include_fail_in_rescue: false