mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 13:22:48 +00:00
moved to exceptions for basic skip/fails
better handling of checkmode and async fix test to follow new flow control
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -81,5 +81,5 @@
|
||||
- name: assert task with async param failed
|
||||
assert:
|
||||
that:
|
||||
- 'script_result3.failed'
|
||||
- 'script_result3.msg == "async is not supported for this task."'
|
||||
- script_result3|failed
|
||||
- script_result3.msg == "async is not supported for this task."
|
||||
|
||||
@@ -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'}
|
||||
|
||||
Reference in New Issue
Block a user