← Back to branch summary

~ubuntu-branches/ubuntu/utopic/heat/utopic-proposed

« back to all changes in this revision

Viewing changes to heat/tests/test_parameters.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Corey Bryant
  • Date: 2015-02-09 15:12:41 UTC
  • mfrom: (1.1.22)
  • Revision ID: package-import@ubuntu.com-20150209151241-e62zx02m846zet2r
Tags: 2014.2.2-0ubuntu1
https://launchpad.net/bugs/1418695
[ Corey Bryant ]
* Resynchronize with stable/juno (423ee27) (LP: #1418695):
  - [b52c916] Convert bool/int values into string for string properties
  - [65294f4] Check that template format plugins are registered
  - [94dec9e] Disable nested validation for ResourceGroup with zero count
  - [c5346cd] Remove mocking of timeutils.utcnow
  - [d8abdfd] Always update nested stacks
  - [edf0198] ResourceGroup allow update of resource_def
  - [aabd3d8] Add Dimensions Default in AWS_CloudWatch_Alarm.yaml
  - [bbf7182] Fix error msg invalid stack or res name
  - [423ee27] Use kwargs for ResourcePropertyConflict exception
* d/p/fix-requirements.patch: Rebased.
* d/control: Bump minimum python-eventlet to get socket_timeout support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/test_parameters.py
251
251
        self.assertIn('wibble', six.text_type(err))
252
252
 
253
253
    def test_list_value_list_default_empty(self):
254
 
        schema = {'Type': 'CommaDelimitedList'}
255
 
        schema['Default'] = ''
 
254
        schema = {'Type': 'CommaDelimitedList', 'Default': ''}
256
255
        p = self.new_parameter('p', schema)
257
 
        self.assertEqual([''], p.value())
 
256
        self.assertEqual([], p.value())
258
257
 
259
258
    def test_list_value_list_good(self):
260
259
        schema = {'Type': 'CommaDelimitedList',