diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-25 17:22:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-25 17:22:59 +0000 |
| commit | 3f30bb0f76d2750f971964265b47fa744f6bef45 (patch) | |
| tree | f8009b12878ce4c838e2f43accaec82934ebbbe8 /ironic/tests | |
| parent | da27e682657162719d7de014f5f3322926ec99b8 (diff) | |
| parent | b96a3548b5f4b58ba0034f3fb3c2a6e035c7d930 (diff) | |
| download | ironic-3f30bb0f76d2750f971964265b47fa744f6bef45.tar.gz | |
Merge "Remove redundant test stubs from conductor/manager"
Diffstat (limited to 'ironic/tests')
| -rw-r--r-- | ironic/tests/conductor/test_manager.py | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/ironic/tests/conductor/test_manager.py b/ironic/tests/conductor/test_manager.py index 98d42c742..f07a79ae2 100644 --- a/ironic/tests/conductor/test_manager.py +++ b/ironic/tests/conductor/test_manager.py @@ -125,7 +125,7 @@ class ManagerTestCase(base.DbTestCase): res = objects.Node.get_by_uuid(self.context, node['uuid']) self.assertEqual(res['extra'], {'test': 'one'}) - def test_update_node_invalid_state(self): + def test_associate_node_invalid_state(self): ndict = utils.get_test_node(driver='fake', extra={'test': 'one'}, instance_uuid=None, @@ -143,7 +143,7 @@ class ManagerTestCase(base.DbTestCase): res = objects.Node.get_by_uuid(self.context, node['uuid']) self.assertEqual(res['instance_uuid'], None) - def test_update_node_valid_state(self): + def test_associate_node_valid_state(self): ndict = utils.get_test_node(driver='fake', instance_uuid=None, power_state=states.NOSTATE) @@ -180,26 +180,6 @@ class ManagerTestCase(base.DbTestCase): res = objects.Node.get_by_uuid(self.context, node['uuid']) self.assertEqual(res['driver'], existing_driver) - def test_update_node_invalid_driver_info(self): - # TODO(deva) - pass - - def test_update_node_get_power_state_failure(self): - # TODO(deva) - pass - - def test_udpate_node_set_driver_info_and_power_state(self): - # TODO(deva) - pass - - def test_update_node_associate_instance(self): - # TODO(deva) - pass - - def test_update_node_unassociate_instance(self): - # TODO(deva) - pass - def test_change_node_power_state_power_on(self): """Test if start_power_state to turn node power on is successful or not. |