← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily

« back to all changes in this revision

Viewing changes to heat/tests/test_sahara_templates.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Corey Bryant, James Page
  • Date: 2015-07-07 17:06:19 UTC
  • mfrom: (1.1.26) (45.1.1 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20150707170619-hra2dbjpfofpou4s
Tags: 1:5.0.0~b1-0ubuntu1
[ Corey Bryant ]
* New upstream milestone for OpenStack Liberty:
  - d/control: Align (build-)depends with upstream.
  - d/p/fix-requirements.patch: Rebased.
  - d/p/sudoers_patch.patch: Rebased.

[ James Page ]
* d/s/options: Ignore any removal of egg-info data during package clean.
* d/control: Drop MySQL and PostgreSQL related BD's, not required for unit
  testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/test_sahara_templates.py
89
89
        self.t = template_format.parse(node_group_template)
90
90
 
91
91
    def _init_ngt(self, template):
92
 
        stack = utils.parse_stack(template)
93
 
        return stack['node-group']
 
92
        self.stack = utils.parse_stack(template)
 
93
        return self.stack['node-group']
94
94
 
95
95
    def test_ngt_resource_mapping(self):
96
96
        ngt = self._init_ngt(self.t)
146
146
        self.ngt_mgr.delete.side_effect = sahara.sahara_base.APIException()
147
147
        delete_task = scheduler.TaskRunner(ngt.delete)
148
148
        ex = self.assertRaises(exception.ResourceFailure, delete_task)
149
 
        expected = "APIException: None"
 
149
        expected = "APIException: resources.node-group: None"
150
150
        self.assertEqual(expected, six.text_type(ex))
151
151
        self.ngt_mgr.delete.assert_called_once_with(self.fake_ngt.id)
152
152
 
188
188
        self.patchobject(ngt, 'is_using_neutron').return_value = False
189
189
 
190
190
        ex = self.assertRaises(exception.StackValidationFailed, ngt.validate)
191
 
        self.assertEqual(u"Property error : node-group: flavor Error "
192
 
                         u"validating value u'm1.large'", six.text_type(ex))
 
191
        self.assertEqual(u"Property error: "
 
192
                         u"resources.node-group.properties.flavor: "
 
193
                         u"Error validating value u'm1.large'",
 
194
                         six.text_type(ex))
193
195
 
194
196
 
195
197
class SaharaClusterTemplateTest(common.HeatTestCase):
209
211
        self.t = template_format.parse(cluster_template)
210
212
 
211
213
    def _init_ct(self, template):
212
 
        stack = utils.parse_stack(template)
213
 
        return stack['cluster-template']
 
214
        self.stack = utils.parse_stack(template)
 
215
        return self.stack['cluster-template']
214
216
 
215
217
    def test_ct_resource_mapping(self):
216
218
        ct = self._init_ct(self.t)
260
262
        self.ct_mgr.delete.side_effect = sahara.sahara_base.APIException()
261
263
        delete_task = scheduler.TaskRunner(ct.delete)
262
264
        ex = self.assertRaises(exception.ResourceFailure, delete_task)
263
 
        expected = "APIException: None"
 
265
        expected = "APIException: resources.cluster-template: None"
264
266
        self.assertEqual(expected, six.text_type(ex))
265
267
        self.ct_mgr.delete.assert_called_once_with(self.fake_ct.id)
266
268