Correct stack and add ceph_ansible_playbook in upgrade unittests.

The stack name being mocked was not matching
with the one used in the args. This didn't fail
because at the time of asserting mock_upgrade
we were passing still the wrong stack name, not
the one from the arguments.

This patch also adds the ceph_ansible_playbook
arg to verifylist.

Change-Id: I854ce652995c3381c389d5f4d7e6b68d881f78bb
This commit is contained in:
Jose Luis Franco Arza
2018-04-13 11:56:26 +02:00
parent e32c3da3ff
commit c4ace0efba

View File

@@ -52,7 +52,7 @@ class TestOvercloudUpgradePrepare(fakes.TestOvercloudUpgradePrepare):
mock_abspath, mock_upgrade, mock_logger,
mock_get_stack):
mock_stack = mock.Mock()
mock_stack.stack_name = 'mystack'
mock_stack.stack_name = 'overcloud'
mock_get_stack.return_value = mock_stack
mock_abspath.return_value = '/home/fake/my-fake-registry.yaml'
mock_yaml.return_value = {'fake_container': 'fake_value'}
@@ -62,14 +62,16 @@ class TestOvercloudUpgradePrepare(fakes.TestOvercloudUpgradePrepare):
verifylist = [
('stack', 'overcloud'),
('templates', constants.TRIPLEO_HEAT_TEMPLATES),
('container_registry_file', 'my-fake-registry.yaml')
('container_registry_file', 'my-fake-registry.yaml'),
('ceph_ansible_playbook', '/usr/share/ceph-ansible'
'/site-docker.yml.sample')
]
parsed_args = self.check_parser(self.cmd, argslist, verifylist)
self.cmd.take_action(parsed_args)
mock_upgrade.assert_called_once_with(
self.app.client_manager,
container='mystack',
container='overcloud',
container_registry={'fake_container': 'fake_value'},
ceph_ansible_playbook='/usr/share/ceph-ansible'
'/site-docker.yml.sample'
@@ -93,7 +95,9 @@ class TestOvercloudUpgradePrepare(fakes.TestOvercloudUpgradePrepare):
verifylist = [
('stack', 'overcloud'),
('templates', constants.TRIPLEO_HEAT_TEMPLATES),
('container_registry_file', 'my-fake-registry.yaml')
('container_registry_file', 'my-fake-registry.yaml'),
('ceph_ansible_playbook', '/usr/share/ceph-ansible'
'/site-docker.yml.sample')
]
parsed_args = self.check_parser(self.cmd, argslist, verifylist)