openstack/deb-heat
Code Issues Proposed changes

Delete children handle_delete testing (Sahara)

Browse Source 
Delete children handle_delete correctness testing
for Resource's children classes.

This tests can be deleted because of testing
correctness of handle_delete in test_resource.

Change-Id: Ib4808f037d8611f18c471e35812cf258cd31cf7a
This commit is contained in:
Peter Razumovsky 2015-09-08 12:51:21 +03:00
parent 92eddc3788
commit 77f3e63a54
3 changed files with 0 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
heat/tests/test_sahara_cluster.py
View File

@ -102,18 +102,6 @@ class SaharaClusterTest(common.HeatTestCase):
**expected_kwargs)
self.cl_mgr.get.assert_called_once_with(self.fake_cl.id)
def test_cluster_delete(self):
cluster = self._create_cluster(self.t)
self.cl_mgr.get.side_effect = [
self.fake_cl,
sahara.sahara_base.APIException(error_code=404)]
self.cl_mgr.get.reset_mock()
scheduler.TaskRunner(cluster.delete)()
self.assertEqual((cluster.DELETE, cluster.COMPLETE),
cluster.state)
self.cl_mgr.delete.assert_called_once_with(self.fake_cl.id)
self.assertEqual(2, self.cl_mgr.get.call_count)
def test_cluster_create_fails(self):
cfg.CONF.set_override('action_retry_limit', 0)
cluster = self._init_cluster(self.t)
@ -125,22 +113,6 @@ class SaharaClusterTest(common.HeatTestCase):
'Went to status Error due to "Unknown"')
self.assertEqual(expected, six.text_type(ex))
def test_cluster_delete_fails(self):
cluster = self._create_cluster(self.t)
self.cl_mgr.delete.side_effect = sahara.sahara_base.APIException()
delete_task = scheduler.TaskRunner(cluster.delete)
ex = self.assertRaises(exception.ResourceFailure, delete_task)
expected = "APIException: resources.super-cluster: None"
self.assertEqual(expected, six.text_type(ex))
self.cl_mgr.delete.assert_called_once_with(self.fake_cl.id)
def test_cluster_not_found_in_delete(self):
cluster = self._create_cluster(self.t)
self.cl_mgr.delete.side_effect = sahara.sahara_base.APIException(
error_code=404)
scheduler.TaskRunner(cluster.delete)()
self.cl_mgr.delete.assert_called_once_with(self.fake_cl.id)
def test_cluster_check_delete_complete_error(self):
cluster = self._create_cluster(self.t)
self.cl_mgr.get.side_effect = [

17
heat/tests/test_sahara_data_source.py
View File

@ -17,7 +17,6 @@ import six
from heat.common import exception
from heat.common import template_format
from heat.engine.clients.os import sahara
from heat.engine.resources.openstack.sahara import data_source
from heat.engine import scheduler
from heat.tests import common
@ -79,13 +78,6 @@ class SaharaDataSourceTest(common.HeatTestCase):
self.assertEqual(data_source.DataSource,
mapping['OS::Sahara::DataSource'])
def test_delete(self):
ds = self._create_resource('data-source', self.rsrc_defn, self.stack)
scheduler.TaskRunner(ds.delete)()
self.assertEqual((ds.DELETE, ds.COMPLETE), ds.state)
self.client.data_sources.delete.assert_called_once_with(
ds.resource_id)
def test_update(self):
ds = self._create_resource('data-source', self.rsrc_defn,
self.stack)
@ -106,15 +98,6 @@ class SaharaDataSourceTest(common.HeatTestCase):
'12345', data)
self.assertEqual((ds.UPDATE, ds.COMPLETE), ds.state)
def test_delete_not_found(self):
ds = self._create_resource('data-source', self.rsrc_defn, self.stack)
self.client.data_sources.delete.side_effect = (
sahara.sahara_base.APIException(error_code=404))
scheduler.TaskRunner(ds.delete)()
self.assertEqual((ds.DELETE, ds.COMPLETE), ds.state)
self.client.data_sources.delete.assert_called_once_with(
ds.resource_id)
def test_show_attribute(self):
ds = self._create_resource('data-source', self.rsrc_defn, self.stack)
value = mock.MagicMock()

44
heat/tests/test_sahara_templates.py
View File

@ -163,28 +163,6 @@ class SaharaNodeGroupTemplateTest(common.HeatTestCase):
self.ngt_mgr.create.assert_called_once_with(*expected_args,
**expected_kwargs)
def test_ngt_delete(self):
ngt = self._create_ngt(self.t)
scheduler.TaskRunner(ngt.delete)()
self.ngt_mgr.delete.assert_called_once_with(self.fake_ngt.id)
self.assertEqual((ngt.DELETE, ngt.COMPLETE), ngt.state)
def test_ngt_delete_ignores_not_found(self):
ngt = self._create_ngt(self.t)
self.ngt_mgr.delete.side_effect = sahara.sahara_base.APIException(
error_code=404)
scheduler.TaskRunner(ngt.delete)()
self.ngt_mgr.delete.assert_called_once_with(self.fake_ngt.id)
def test_ngt_delete_fails(self):
ngt = self._create_ngt(self.t)
self.ngt_mgr.delete.side_effect = sahara.sahara_base.APIException()
delete_task = scheduler.TaskRunner(ngt.delete)
ex = self.assertRaises(exception.ResourceFailure, delete_task)
expected = "APIException: resources.node-group: None"
self.assertEqual(expected, six.text_type(ex))
self.ngt_mgr.delete.assert_called_once_with(self.fake_ngt.id)
def test_validate_floatingippool_on_neutron_fails(self):
ngt = self._init_ngt(self.t)
self.patchobject(ngt, 'is_using_neutron').return_value = True
@ -300,28 +278,6 @@ class SaharaClusterTemplateTest(common.HeatTestCase):
}
self.ct_mgr.create.assert_called_once_with(**args)
def test_ct_delete(self):
ct = self._create_ct(self.t)
scheduler.TaskRunner(ct.delete)()
self.ct_mgr.delete.assert_called_once_with(self.fake_ct.id)
self.assertEqual((ct.DELETE, ct.COMPLETE), ct.state)
def test_ngt_delete_ignores_not_found(self):
ct = self._create_ct(self.t)
self.ct_mgr.delete.side_effect = sahara.sahara_base.APIException(
error_code=404)
scheduler.TaskRunner(ct.delete)()
self.ct_mgr.delete.assert_called_once_with(self.fake_ct.id)
def test_ngt_delete_fails(self):
ct = self._create_ct(self.t)
self.ct_mgr.delete.side_effect = sahara.sahara_base.APIException()
delete_task = scheduler.TaskRunner(ct.delete)
ex = self.assertRaises(exception.ResourceFailure, delete_task)
expected = "APIException: resources.cluster-template: None"
self.assertEqual(expected, six.text_type(ex))
self.ct_mgr.delete.assert_called_once_with(self.fake_ct.id)
def test_ct_validate_no_network_on_neutron_fails(self):
self.t['resources']['cluster-template']['properties'].pop(
'neutron_management_network')