summaryrefslogtreecommitdiff
path: root/ironic
diff options
context:
space:
mode:
authorzhu.fanglei <zhu.fanglei@zte.com.cn>2020-09-10 16:54:40 +0800
committerzhufl <zhu.fanglei@zte.com.cn>2020-09-25 06:01:09 +0000
commitd5df36febb2578941c5d933d9d191a02aafaf50b (patch)
tree222ecd52f5954ca0f9dca2a17a60e106002ad4dc /ironic
parent11aa5f66398c336699022566cb2d0d3cf7cdfcd1 (diff)
downloadironic-d5df36febb2578941c5d933d9d191a02aafaf50b.tar.gz
Fix invalid assert_has_calls
This is to fix the invalid assert_has_calls usage, "assert_has_calls = ", should be "assert_has_calls(". Change-Id: I402fea1908a69f65be84c7e1ab179367ca03a060
Diffstat (limited to 'ironic')
-rw-r--r--ironic/tests/unit/conductor/test_deployments.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/ironic/tests/unit/conductor/test_deployments.py b/ironic/tests/unit/conductor/test_deployments.py
index 5a72dc452..395c643a1 100644
--- a/ironic/tests/unit/conductor/test_deployments.py
+++ b/ironic/tests/unit/conductor/test_deployments.py
@@ -595,7 +595,7 @@ class DoNextDeployStepTestCase(mgr_utils.ServiceSetUpMixin,
task = task_manager.TaskManager(self.context, node.uuid)
task.process_event('deploy')
- deployments.do_next_deploy_step(task, 1, self.service.conductor.id)
+ deployments.do_next_deploy_step(task, 0, self.service.conductor.id)
# Deploying should be complete
node.refresh()
@@ -604,8 +604,9 @@ class DoNextDeployStepTestCase(mgr_utils.ServiceSetUpMixin,
self.assertEqual({}, node.deploy_step)
self.assertNotIn('deploy_step_index', node.driver_internal_info)
self.assertIsNone(node.driver_internal_info['deploy_steps'])
- mock_execute.assert_has_calls = [mock.call(self.deploy_steps[0]),
- mock.call(self.deploy_steps[1])]
+ mock_execute.assert_has_calls(
+ [mock.call(task.driver.deploy, task, self.deploy_steps[0]),
+ mock.call(task.driver.deploy, task, self.deploy_steps[1])])
self.assertNotIn('agent_url', node.driver_internal_info)
self.assertNotIn('agent_secret_token', node.driver_internal_info)
@@ -628,7 +629,7 @@ class DoNextDeployStepTestCase(mgr_utils.ServiceSetUpMixin,
task = task_manager.TaskManager(self.context, node.uuid)
task.process_event('deploy')
- deployments.do_next_deploy_step(task, 1, self.service.conductor.id)
+ deployments.do_next_deploy_step(task, 0, self.service.conductor.id)
# Deploying should be complete
node.refresh()
@@ -637,8 +638,9 @@ class DoNextDeployStepTestCase(mgr_utils.ServiceSetUpMixin,
self.assertEqual({}, node.deploy_step)
self.assertNotIn('deploy_step_index', node.driver_internal_info)
self.assertIsNone(node.driver_internal_info['deploy_steps'])
- mock_execute.assert_has_calls = [mock.call(self.deploy_steps[0]),
- mock.call(self.deploy_steps[1])]
+ mock_execute.assert_has_calls(
+ [mock.call(task.driver.deploy, task, self.deploy_steps[0]),
+ mock.call(task.driver.deploy, task, self.deploy_steps[1])])
self.assertEqual('url', node.driver_internal_info['agent_url'])
self.assertEqual('token',
node.driver_internal_info['agent_secret_token'])