moved to exceptions for basic skip/fails

better handling of checkmode and async
fix test to follow new flow control

(cherry picked from commit e29dc49a49eb042cb2f707eb8e9e030a718677ed)

3 files changed, 26 insertions, 15 deletions

diff --git a/test/integration/targets/module_utils/module_utils_test.yml b/test/integration/targets/module_utils/module_utils_test.yml
index a131727084..ee737c6cdc 100644
--- a/test/integration/targets/module_utils/module_utils_test.yml
+++ b/test/integration/targets/module_utils/module_utils_test.yml
@@ -36,7 +36,7 @@
   - name: Make sure the we used the local facts.py, not the one shipped with ansible
     assert:
       that:
-        - 'result["data"] == "overridden facts.py"'
+        - result["data"] == "overridden facts.py"
 
   - name: Test that importing a module that only exists inside of a submodule does not work
     test_failure:
@@ -47,5 +47,5 @@
   - name: Make sure we failed in AnsiBallZ
     assert:
       that:
-        - 'result["failed"] == True'
-        - '"Could not find imported module support code for test_failure.  Looked for either foo.py or zebra.py" == result["msg"]'
+        - result|failed
+        - result['msg'] == "Could not find imported module support code for test_failure.  Looked for either foo.py or zebra.py"
diff --git a/test/integration/targets/script/tasks/main.yml b/test/integration/targets/script/tasks/main.yml
index 2c0f1f02ad..7b31444190 100644
--- a/test/integration/targets/script/tasks/main.yml
+++ b/test/integration/targets/script/tasks/main.yml
@@ -69,3 +69,17 @@
     that:
       - "script_result1|changed"
       - "script_result2.state == 'absent'"
+
+# async
+- name: test task failure with async param
+
+  script: /some/script.sh
+  async: 2
+  ignore_errors: true
+  register: script_result3
+
+- name: assert task with async param failed
+  assert:
+    that:
+      - script_result3|failed
+      - script_result3.msg == "async is not supported for this task."
diff --git a/test/units/plugins/action/test_raw.py b/test/units/plugins/action/test_raw.py
index c48d38b437..b6e12ee339 100644
--- a/test/units/plugins/action/test_raw.py
+++ b/test/units/plugins/action/test_raw.py
@@ -18,7 +18,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-
+from ansible.errors import AnsibleActionFail
 from ansible.compat.tests import unittest
 from ansible.compat.tests.mock import patch, MagicMock, Mock
 from ansible.plugins.action.raw import ActionModule
@@ -43,7 +43,7 @@ class TestCopyResultExclude(unittest.TestCase):
 
         play_context = Mock()
         task = MagicMock(Task)
-        task.async = MagicMock()
+        task.async = False
         connection = Mock()
 
         task.args = {'_raw_params': 'Args1'}
@@ -60,25 +60,22 @@ class TestCopyResultExclude(unittest.TestCase):
 
         play_context = Mock()
         task = MagicMock(Task)
-        task.async = MagicMock()
+        task.async = False
         connection = Mock()
 
         task.args = {'_raw_params': 'Args1'}
         play_context.check_mode = True
 
-        self.mock_am = ActionModule(task, connection, play_context, loader=None, templar=None, shared_loader_obj=None)
-        self.mock_am._low_level_execute_command = Mock(return_value = {})
-        self.mock_am.display = Mock()
-
-        skipped_result = self.mock_am.run()
-
-        self.assertEqual(skipped_result.get('skipped'), True)
+        try:
+            self.mock_am = ActionModule(task, connection, play_context, loader=None, templar=None, shared_loader_obj=None)
+        except AnsibleActionFail:
+            pass
 
     def test_raw_test_environment_is_None(self):
 
         play_context = Mock()
         task = MagicMock(Task)
-        task.async = MagicMock()
+        task.async = False
         connection = Mock()
 
         task.args = {'_raw_params': 'Args1'}
@@ -95,7 +92,7 @@ class TestCopyResultExclude(unittest.TestCase):
 
         play_context = Mock()
         task = MagicMock(Task)
-        task.async = MagicMock()
+        task.async = False
         connection = Mock()
 
         task.args = {'_raw_params': 'Args1'}