summaryrefslogtreecommitdiff
path: root/ironic/tests/unit/drivers/modules/test_agent.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-03-28 20:18:44 +0000
committerGerrit Code Review <review@openstack.org>2020-03-28 20:18:44 +0000
commit216c153bfa6e07f201f2db2ae7361182d8daf991 (patch)
treebb76ff815de5d4bb726772c5fe10189e10d19e20 /ironic/tests/unit/drivers/modules/test_agent.py
parent05ea0d1842a220c6868eece632e0f294110671e3 (diff)
parent8e472a07b533d821b0f0493b16796b9192f25af9 (diff)
downloadironic-216c153bfa6e07f201f2db2ae7361182d8daf991.tar.gz
Merge "Raise human-friendly messages on attempt to use pre-deploy steps drivers"
Diffstat (limited to 'ironic/tests/unit/drivers/modules/test_agent.py')
-rw-r--r--ironic/tests/unit/drivers/modules/test_agent.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/ironic/tests/unit/drivers/modules/test_agent.py b/ironic/tests/unit/drivers/modules/test_agent.py
index 9a337e58a..72cf49bc8 100644
--- a/ironic/tests/unit/drivers/modules/test_agent.py
+++ b/ironic/tests/unit/drivers/modules/test_agent.py
@@ -1280,7 +1280,7 @@ class TestAgentDeploy(db_base.DbTestCase):
get_power_state_mock.assert_called_once_with(task)
node_power_action_mock.assert_called_once_with(
task, states.POWER_ON)
- self.assertEqual(states.DEPLOYING, task.node.provision_state)
+ self.assertEqual(states.DEPLOYWAIT, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state)
self.assertTrue(remove_symlink_mock.called)
resume_mock.assert_called_once_with(task)
@@ -1330,7 +1330,7 @@ class TestAgentDeploy(db_base.DbTestCase):
get_power_state_mock.assert_called_once_with(task)
node_power_action_mock.assert_called_once_with(
task, states.POWER_ON)
- self.assertEqual(states.DEPLOYING, task.node.provision_state)
+ self.assertEqual(states.DEPLOYWAIT, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state)
resume_mock.assert_called_once_with(task)
@@ -1391,7 +1391,7 @@ class TestAgentDeploy(db_base.DbTestCase):
get_power_state_mock.assert_called_once_with(task)
node_power_action_mock.assert_called_once_with(
task, states.POWER_ON)
- self.assertEqual(states.DEPLOYING, task.node.provision_state)
+ self.assertEqual(states.DEPLOYWAIT, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state)
resume_mock.assert_called_once_with(task)
@@ -1455,7 +1455,7 @@ class TestAgentDeploy(db_base.DbTestCase):
get_power_state_mock.assert_called_once_with(task)
node_power_action_mock.assert_called_once_with(
task, states.POWER_ON)
- self.assertEqual(states.DEPLOYING, task.node.provision_state)
+ self.assertEqual(states.DEPLOYWAIT, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state)
@mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True)
@@ -1554,7 +1554,7 @@ class TestAgentDeploy(db_base.DbTestCase):
get_power_state_mock.assert_called_once_with(task)
node_power_action_mock.assert_called_once_with(
task, states.POWER_ON)
- self.assertEqual(states.DEPLOYING, task.node.provision_state)
+ self.assertEqual(states.DEPLOYWAIT, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state)
resume_mock.assert_called_once_with(task)