← Back to branch summary

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

« back to all changes in this revision

Viewing changes to heat/tests/openstack/test_waitcondition.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant
  • Date: 2015-09-08 15:52:07 UTC
  • mfrom: (1.1.28)
  • Revision ID: package-import@ubuntu.com-20150908155207-zi2r1rckyrevr5u7
Tags: 1:5.0.0~b3-0ubuntu1
* New upstream milestone for OpenStack Liberty.
* d/control: Align (build-)depends with upstream.
* d/p/fix-dummy-resource-missing.patch: Dropped. Fixed in milestone.
* d/p/move-extensions.patch: Dropped. Fixed in milestone.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/openstack/test_waitcondition.py
14
14
import datetime
15
15
import uuid
16
16
 
 
17
from oslo_serialization import jsonutils as json
17
18
from oslo_utils import timeutils
18
19
import six
19
20
 
213
214
                         'status': 'SUCCESS', 'id': '456'}
214
215
        ret = handle.handle_signal(details=test_metadata)
215
216
        wc_att = rsrc.FnGetAtt('data')
216
 
        self.assertEqual(u'{"123": "foo", "456": "dog"}', wc_att)
 
217
        self.assertEqual(json.loads(u'{"123": "foo", "456": "dog"}'),
 
218
                         json.loads(wc_att))
217
219
        self.assertEqual('status:SUCCESS reason:cat', ret)
218
220
        self.m.VerifyAll()
219
221
 
230
232
                         'status': 'SUCCESS'}
231
233
        ret = handle.handle_signal(details=test_metadata)
232
234
        wc_att = rsrc.FnGetAtt('data')
233
 
        self.assertEqual(u'{"1": "foo", "2": "dog"}', wc_att)
 
235
        self.assertEqual(json.loads(u'{"1": "foo", "2": "dog"}'),
 
236
                         json.loads(wc_att))
234
237
        self.assertEqual('status:SUCCESS reason:cat', ret)
235
238
        self.m.VerifyAll()
236
239
 
244
247
 
245
248
        handle.handle_signal()
246
249
        wc_att = rsrc.FnGetAtt('data')
247
 
        self.assertEqual(u'{"1": null, "2": null}', wc_att)
 
250
        self.assertEqual(json.loads(u'{"1": null, "2": null}'),
 
251
                         json.loads(wc_att))
248
252
        self.m.VerifyAll()
249
253
 
250
254
    def test_data_partial_complete(self):
261
265
        expected = 'status:SUCCESS reason:Signal 2 received'
262
266
        self.assertEqual(expected, ret)
263
267
        wc_att = rsrc.FnGetAtt('data')
264
 
        self.assertEqual(u'{"1": null, "2": null}', wc_att)
 
268
        self.assertEqual(json.loads(u'{"1": null, "2": null}'),
 
269
                         json.loads(wc_att))
265
270
        self.m.VerifyAll()
266
271
 
267
272
    def _create_heat_handle(self):
273
278
 
274
279
        handle = self.stack['wait_handle']
275
280
        self.assertEqual((handle.CREATE, handle.COMPLETE), handle.state)
 
281
        self.assertIsNotNone(handle.password)
 
282
        self.assertEqual(handle.resource_id, handle.data().get('user_id'))
276
283
        return handle
277
284
 
278
285
    def test_get_status_none_complete(self):