From c4ace0efbac5356c563379dafa21fa14dfee0337 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Fri, 13 Apr 2018 11:56:26 +0200 Subject: [PATCH] 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 --- .../v1/overcloud_upgrade/test_overcloud_upgrade.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py index 24a5425ee..855f3a902 100644 --- a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py +++ b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py @@ -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)