diff options
author | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-03-09 14:26:23 +0100 |
---|---|---|
committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-03-12 12:24:09 +0100 |
commit | 529c3ff06693d0a1aa13081acff92010fe855c50 (patch) | |
tree | 56f8c3d8e6cab4252e0e016e45d8dd9c7c7debf0 /ironic/tests/unit/drivers/modules/ansible | |
parent | 56ec6ea2bae2d8fd05692969337ece886ff20577 (diff) | |
download | ironic-529c3ff06693d0a1aa13081acff92010fe855c50.tar.gz |
Remove compatibility with pre-deploy steps drivers
It was supposed to be removed in Stein, so should be fine to do now.
Change-Id: I4996961b86be5ccc27b6c1066c1560564fe5cd41
Story: #2006963
Diffstat (limited to 'ironic/tests/unit/drivers/modules/ansible')
-rw-r--r-- | ironic/tests/unit/drivers/modules/ansible/test_deploy.py | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/ironic/tests/unit/drivers/modules/ansible/test_deploy.py b/ironic/tests/unit/drivers/modules/ansible/test_deploy.py index 8787848ff..95741d02e 100644 --- a/ironic/tests/unit/drivers/modules/ansible/test_deploy.py +++ b/ironic/tests/unit/drivers/modules/ansible/test_deploy.py @@ -997,29 +997,6 @@ class TestAnsibleDeploy(AnsibleDeployTestCaseBase): task.driver.boot.clean_up_ramdisk.assert_called_once_with( task) - @mock.patch.object(utils, 'notify_conductor_resume_deploy', autospec=True) - @mock.patch.object(utils, 'node_set_boot_device', autospec=True) - def test_reboot_to_instance_deprecated(self, bootdev_mock, resume_mock): - # TODO(rloo): no deploy steps; delete this when we remove support - # for handling no deploy steps. - self.node.provision_state = states.DEPLOYING - self.node.deploy_step = None - self.node.save() - with task_manager.acquire(self.context, self.node.uuid) as task: - with mock.patch.object(self.driver, 'reboot_and_finish_deploy', - autospec=True): - task.driver.boot = mock.Mock() - task.process_event = mock.Mock() - self.driver.reboot_to_instance(task) - bootdev_mock.assert_called_once_with(task, 'disk', - persistent=True) - self.assertFalse(resume_mock.called) - task.process_event.assert_called_once_with('done') - self.driver.reboot_and_finish_deploy.assert_called_once_with( - task) - task.driver.boot.clean_up_ramdisk.assert_called_once_with( - task) - @mock.patch.object(utils, 'restore_power_state_if_needed', autospec=True) @mock.patch.object(utils, 'power_on_node_if_needed') @mock.patch.object(utils, 'node_power_action', autospec=True) |