mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-25 03:41:25 -07:00
Moving ConnectionInformation -> PlayContext
Also making PlayContext a child class of the Playbook Base class, which gives it access to all of the FieldAttribute code to ensure field values are correctly typed after post_validation Fixes #11381
This commit is contained in:
parent
919aaa5c42
commit
e64989beb4
36 changed files with 477 additions and 459 deletions
|
@ -23,8 +23,8 @@ from ansible.compat.tests import unittest
|
|||
from ansible.compat.tests.mock import patch, MagicMock
|
||||
|
||||
from ansible.errors import AnsibleError, AnsibleParserError
|
||||
from ansible.executor.connection_info import ConnectionInformation
|
||||
from ansible.executor.task_executor import TaskExecutor
|
||||
from ansible.playbook.play_context import PlayContext
|
||||
from ansible.plugins import action_loader
|
||||
|
||||
from units.mock.loader import DictDataLoader
|
||||
|
@ -41,7 +41,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
fake_loader = DictDataLoader({})
|
||||
mock_host = MagicMock()
|
||||
mock_task = MagicMock()
|
||||
mock_conn_info = MagicMock()
|
||||
mock_play_context = MagicMock()
|
||||
mock_shared_loader = MagicMock()
|
||||
new_stdin = None
|
||||
job_vars = dict()
|
||||
|
@ -49,7 +49,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
host = mock_host,
|
||||
task = mock_task,
|
||||
job_vars = job_vars,
|
||||
connection_info = mock_conn_info,
|
||||
play_context = mock_play_context,
|
||||
new_stdin = new_stdin,
|
||||
loader = fake_loader,
|
||||
shared_loader_obj = mock_shared_loader,
|
||||
|
@ -63,7 +63,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
mock_task = MagicMock()
|
||||
mock_task._role._role_path = '/path/to/role/foo'
|
||||
|
||||
mock_conn_info = MagicMock()
|
||||
mock_play_context = MagicMock()
|
||||
|
||||
mock_shared_loader = MagicMock()
|
||||
|
||||
|
@ -74,7 +74,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
host = mock_host,
|
||||
task = mock_task,
|
||||
job_vars = job_vars,
|
||||
connection_info = mock_conn_info,
|
||||
play_context = mock_play_context,
|
||||
new_stdin = new_stdin,
|
||||
loader = fake_loader,
|
||||
shared_loader_obj = mock_shared_loader,
|
||||
|
@ -104,7 +104,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
mock_task.loop = 'items'
|
||||
mock_task.loop_args = ['a', 'b', 'c']
|
||||
|
||||
mock_conn_info = MagicMock()
|
||||
mock_play_context = MagicMock()
|
||||
|
||||
mock_shared_loader = MagicMock()
|
||||
|
||||
|
@ -115,7 +115,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
host = mock_host,
|
||||
task = mock_task,
|
||||
job_vars = job_vars,
|
||||
connection_info = mock_conn_info,
|
||||
play_context = mock_play_context,
|
||||
new_stdin = new_stdin,
|
||||
loader = fake_loader,
|
||||
shared_loader_obj = mock_shared_loader,
|
||||
|
@ -138,7 +138,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
mock_task = MagicMock()
|
||||
mock_task.copy.side_effect = _copy
|
||||
|
||||
mock_conn_info = MagicMock()
|
||||
mock_play_context = MagicMock()
|
||||
|
||||
mock_shared_loader = MagicMock()
|
||||
|
||||
|
@ -149,7 +149,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
host = mock_host,
|
||||
task = mock_task,
|
||||
job_vars = job_vars,
|
||||
connection_info = mock_conn_info,
|
||||
play_context = mock_play_context,
|
||||
new_stdin = new_stdin,
|
||||
loader = fake_loader,
|
||||
shared_loader_obj = mock_shared_loader,
|
||||
|
@ -180,7 +180,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
mock_task = MagicMock()
|
||||
mock_task.evaluate_conditional.side_effect = _evaluate_conditional
|
||||
|
||||
mock_conn_info = MagicMock()
|
||||
mock_play_context = MagicMock()
|
||||
|
||||
mock_shared_loader = None
|
||||
|
||||
|
@ -191,7 +191,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
host = mock_host,
|
||||
task = mock_task,
|
||||
job_vars = job_vars,
|
||||
connection_info = mock_conn_info,
|
||||
play_context = mock_play_context,
|
||||
new_stdin = new_stdin,
|
||||
loader = fake_loader,
|
||||
shared_loader_obj = mock_shared_loader,
|
||||
|
@ -220,9 +220,9 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
mock_task.failed_when = None
|
||||
mock_task.post_validate.return_value = None
|
||||
|
||||
mock_conn_info = MagicMock()
|
||||
mock_conn_info.post_validate.return_value = None
|
||||
mock_conn_info.update_vars.return_value = None
|
||||
mock_play_context = MagicMock()
|
||||
mock_play_context.post_validate.return_value = None
|
||||
mock_play_context.update_vars.return_value = None
|
||||
|
||||
mock_connection = MagicMock()
|
||||
mock_connection.set_host_overrides.return_value = None
|
||||
|
@ -238,7 +238,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
host = mock_host,
|
||||
task = mock_task,
|
||||
job_vars = job_vars,
|
||||
connection_info = mock_conn_info,
|
||||
play_context = mock_play_context,
|
||||
new_stdin = new_stdin,
|
||||
loader = fake_loader,
|
||||
shared_loader_obj = shared_loader,
|
||||
|
@ -275,7 +275,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
mock_task.async = 3
|
||||
mock_task.poll = 1
|
||||
|
||||
mock_conn_info = MagicMock()
|
||||
mock_play_context = MagicMock()
|
||||
|
||||
mock_connection = MagicMock()
|
||||
|
||||
|
@ -289,7 +289,7 @@ class TestTaskExecutor(unittest.TestCase):
|
|||
host = mock_host,
|
||||
task = mock_task,
|
||||
job_vars = job_vars,
|
||||
connection_info = mock_conn_info,
|
||||
play_context = mock_play_context,
|
||||
new_stdin = new_stdin,
|
||||
loader = fake_loader,
|
||||
shared_loader_obj = shared_loader,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue