Consider parent also when comparing IncludedFile (#37083)

* Consider parent also when comparing IncludedFile

* Add new tests for IncludedFile and convert to pytest
pull/38980/head
Matt Martz 7 years ago committed by GitHub
parent a08459a814
commit cdb79b0e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -46,7 +46,7 @@ class IncludedFile:
self._hosts.append(host) self._hosts.append(host)
def __eq__(self, other): def __eq__(self, other):
return other._filename == self._filename and other._args == self._args return other._filename == self._filename and other._args == self._args and other._task._parent._uuid == self._task._parent._uuid
def __repr__(self): def __repr__(self):
return "%s (%s): %s" % (self._filename, self._args, self._hosts) return "%s (%s): %s" % (self._filename, self._args, self._hosts)

@ -21,7 +21,8 @@ __metaclass__ = type
import os import os
from ansible.compat.tests import unittest import pytest
from ansible.compat.tests.mock import MagicMock from ansible.compat.tests.mock import MagicMock
from units.mock.loader import DictDataLoader from units.mock.loader import DictDataLoader
@ -32,32 +33,70 @@ from ansible.executor import task_result
from ansible.playbook.included_file import IncludedFile from ansible.playbook.included_file import IncludedFile
class TestIncludedFile(unittest.TestCase): @pytest.fixture
def test(self): def mock_iterator():
mock_iterator = MagicMock(name='MockIterator')
mock_iterator._play = MagicMock(name='MockPlay')
return mock_iterator
@pytest.fixture
def mock_variable_manager():
# TODO: can we use a real VariableManager?
mock_variable_manager = MagicMock(name='MockVariableManager')
mock_variable_manager.get_vars.return_value = dict()
return mock_variable_manager
def test_included_file_instantiation():
filename = 'somefile.yml' filename = 'somefile.yml'
inc_file = IncludedFile(filename=filename, args=[], task=None) inc_file = IncludedFile(filename=filename, args=[], task=None)
self.assertIsInstance(inc_file, IncludedFile) assert isinstance(inc_file, IncludedFile)
self.assertEquals(inc_file._filename, filename) assert inc_file._filename == filename
self.assertEquals(inc_file._args, []) assert inc_file._args == []
self.assertEquals(inc_file._task, None) assert inc_file._task is None
def test_process_include_results(mock_iterator, mock_variable_manager):
hostname = "testhost1"
hostname2 = "testhost2"
parent_task_ds = {'debug': 'msg=foo'}
parent_task = Task.load(parent_task_ds)
task_ds = {'include': 'include_test.yml'}
loaded_task = TaskInclude.load(task_ds, task_include=parent_task)
return_data = {'include': 'include_test.yml'}
# The task in the TaskResult has to be a TaskInclude so it has a .static attr
result1 = task_result.TaskResult(host=hostname, task=loaded_task, return_data=return_data)
result2 = task_result.TaskResult(host=hostname2, task=loaded_task, return_data=return_data)
results = [result1, result2]
fake_loader = DictDataLoader({'include_test.yml': ""})
res = IncludedFile.process_include_results(results, mock_iterator, fake_loader, mock_variable_manager)
assert isinstance(res, list)
assert len(res) == 1
assert res[0]._filename == os.path.join(os.getcwd(), 'include_test.yml')
assert res[0]._hosts == ['testhost1', 'testhost2']
assert res[0]._args == {}
def test_process_include_results(self): def test_process_include_diff_files(mock_iterator, mock_variable_manager):
hostname = "testhost1" hostname = "testhost1"
hostname2 = "testhost2" hostname2 = "testhost2"
parent_task_ds = {'debug': 'msg=foo'} parent_task_ds = {'debug': 'msg=foo'}
parent_task = Task() parent_task = Task.load(parent_task_ds)
parent_task.load(parent_task_ds)
task_ds = {'include': 'include_test.yml'} task_ds = {'include': 'include_test.yml'}
task_include = TaskInclude() loaded_task = TaskInclude.load(task_ds, task_include=parent_task)
loaded_task = task_include.load(task_ds, task_include=parent_task)
child_task_ds = {'include': 'other_include_test.yml'} child_task_ds = {'include': 'other_include_test.yml'}
child_task_include = TaskInclude() loaded_child_task = TaskInclude.load(child_task_ds, task_include=loaded_task)
loaded_child_task = child_task_include.load(child_task_ds, task_include=loaded_task)
return_data = {'include': 'include_test.yml'} return_data = {'include': 'include_test.yml'}
# The task in the TaskResult has to be a TaskInclude so it has a .static attr # The task in the TaskResult has to be a TaskInclude so it has a .static attr
@ -70,32 +109,46 @@ class TestIncludedFile(unittest.TestCase):
fake_loader = DictDataLoader({'include_test.yml': "", fake_loader = DictDataLoader({'include_test.yml': "",
'other_include_test.yml': ""}) 'other_include_test.yml': ""})
mock_tqm = MagicMock(name='MockTaskQueueManager') res = IncludedFile.process_include_results(results, mock_iterator, fake_loader, mock_variable_manager)
assert isinstance(res, list)
assert res[0]._filename == os.path.join(os.getcwd(), 'include_test.yml')
assert res[1]._filename == os.path.join(os.getcwd(), 'other_include_test.yml')
mock_play = MagicMock(name='MockPlay') assert res[0]._hosts == ['testhost1']
assert res[1]._hosts == ['testhost2']
mock_iterator = MagicMock(name='MockIterator') assert res[0]._args == {}
mock_iterator._play = mock_play assert res[1]._args == {}
def test_process_include_simulate_free(mock_iterator, mock_variable_manager):
hostname = "testhost1"
hostname2 = "testhost2"
mock_inventory = MagicMock(name='MockInventory') parent_task_ds = {'debug': 'msg=foo'}
mock_inventory._hosts_cache = dict() parent_task1 = Task.load(parent_task_ds)
parent_task2 = Task.load(parent_task_ds)
def _get_host(host_name): task_ds = {'include': 'include_test.yml'}
return None loaded_task1 = TaskInclude.load(task_ds, task_include=parent_task1)
loaded_task2 = TaskInclude.load(task_ds, task_include=parent_task2)
mock_inventory.get_host.side_effect = _get_host return_data = {'include': 'include_test.yml'}
# The task in the TaskResult has to be a TaskInclude so it has a .static attr
result1 = task_result.TaskResult(host=hostname, task=loaded_task1, return_data=return_data)
result2 = task_result.TaskResult(host=hostname2, task=loaded_task2, return_data=return_data)
results = [result1, result2]
# TODO: can we use a real VariableManager? fake_loader = DictDataLoader({'include_test.yml': ""})
mock_variable_manager = MagicMock(name='MockVariableManager')
mock_variable_manager.get_vars.return_value = dict()
res = IncludedFile.process_include_results(results, mock_iterator, fake_loader, mock_variable_manager) res = IncludedFile.process_include_results(results, mock_iterator, fake_loader, mock_variable_manager)
self.assertIsInstance(res, list) assert isinstance(res, list)
self.assertEquals(res[0]._filename, os.path.join(os.getcwd(), 'include_test.yml')) assert len(res) == 2
self.assertEquals(res[1]._filename, os.path.join(os.getcwd(), 'other_include_test.yml')) assert res[0]._filename == os.path.join(os.getcwd(), 'include_test.yml')
assert res[1]._filename == os.path.join(os.getcwd(), 'include_test.yml')
self.assertEquals(res[0]._hosts, ['testhost1']) assert res[0]._hosts == ['testhost1']
self.assertEquals(res[1]._hosts, ['testhost2']) assert res[1]._hosts == ['testhost2']
self.assertEquals(res[0]._args, {}) assert res[0]._args == {}
self.assertEquals(res[1]._args, {}) assert res[1]._args == {}

Loading…
Cancel
Save