diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-09-27 04:27:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-09-27 04:27:41 +0000 |
| commit | 96dbb0911c8d139a5b3fe64af82783cf81790ff8 (patch) | |
| tree | 908164139ac1341dc1b70819d825cbaa986dd7ae /heatclient/tests | |
| parent | 455b1cb4e88cff87787d69ecf196c64be0467ed4 (diff) | |
| parent | 795d52c6418fa3beab2e3385da11ece8fca3db37 (diff) | |
| download | python-heatclient-0.2.5.tar.gz | |
Merge "Allow -P to be invoked multiple times"0.2.5
Diffstat (limited to 'heatclient/tests')
| -rw-r--r-- | heatclient/tests/test_utils.py | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/heatclient/tests/test_utils.py b/heatclient/tests/test_utils.py index 55d7bc7..192bd42 100644 --- a/heatclient/tests/test_utils.py +++ b/heatclient/tests/test_utils.py @@ -23,10 +23,10 @@ class shellTest(testtools.TestCase): self.assertEqual({}, utils.format_parameters(None)) def test_format_parameters(self): - p = utils.format_parameters( + p = utils.format_parameters([ 'InstanceType=m1.large;DBUsername=wp;' 'DBPassword=verybadpassword;KeyName=heat_key;' - 'LinuxDistribution=F17') + 'LinuxDistribution=F17']) self.assertEqual({'InstanceType': 'm1.large', 'DBUsername': 'wp', 'DBPassword': 'verybadpassword', @@ -35,20 +35,50 @@ class shellTest(testtools.TestCase): }, p) def test_format_parameters_split(self): - p = utils.format_parameters( + p = utils.format_parameters([ 'KeyName=heat_key;' 'DnsSecKey=hsgx1m31PbamNF4WEcHlwjIlCGgifOdoB58/wwC7a4oAONQ/fDV5ct' 'qrYBoLlKHhTfkyQEw9iVScKYZbbMtMNg==;' - 'UpstreamDNS=8.8.8.8') + 'UpstreamDNS=8.8.8.8']) self.assertEqual({'KeyName': 'heat_key', 'DnsSecKey': 'hsgx1m31PbamNF4WEcHlwjIlCGgifOdoB58/ww' 'C7a4oAONQ/fDV5ctqrYBoLlKHhTfkyQEw9iVScKYZbbMtMNg==', 'UpstreamDNS': '8.8.8.8'}, p) + def test_format_parameters_multiple(self): + p = utils.format_parameters([ + 'KeyName=heat_key', + 'DnsSecKey=hsgx1m31PbamNF4WEcHlwjIlCGgifOdoB58/wwC7a4oAONQ/fDV5ct' + 'qrYBoLlKHhTfkyQEw9iVScKYZbbMtMNg==', + 'UpstreamDNS=8.8.8.8']) + self.assertEqual({'KeyName': 'heat_key', + 'DnsSecKey': 'hsgx1m31PbamNF4WEcHlwjIlCGgifOdoB58/ww' + 'C7a4oAONQ/fDV5ctqrYBoLlKHhTfkyQEw9iVScKYZbbMtMNg==', + 'UpstreamDNS': '8.8.8.8'}, p) + + def test_format_parameters_multiple_semicolon_values(self): + p = utils.format_parameters([ + 'KeyName=heat_key', + 'DnsSecKey=hsgx1m31;PbaNF4WEcHlwj;IlCGgfOdoB;58/ww7a4oAO;NQ/fD==', + 'UpstreamDNS=8.8.8.8']) + self.assertEqual({'KeyName': 'heat_key', + 'DnsSecKey': 'hsgx1m31;PbaNF4WEcHlwj;IlCGgfOdoB;58/' + 'ww7a4oAO;NQ/fD==', + 'UpstreamDNS': '8.8.8.8'}, p) + def test_format_parameter_bad_parameter(self): - params = 'KeyName=heat_key;UpstreamDNS8.8.8.8' - self.assertRaises(exc.CommandError, - utils.format_parameters, params) + params = ['KeyName=heat_key;UpstreamDNS8.8.8.8'] + ex = self.assertRaises(exc.CommandError, + utils.format_parameters, params) + self.assertEqual('Malformed parameter(UpstreamDNS8.8.8.8). ' + 'Use the key=value format.', str(ex)) + + def test_format_multiple_bad_parameter(self): + params = ['KeyName=heat_key', 'UpstreamDNS8.8.8.8'] + ex = self.assertRaises(exc.CommandError, + utils.format_parameters, params) + self.assertEqual('Malformed parameter(UpstreamDNS8.8.8.8). ' + 'Use the key=value format.', str(ex)) def test_link_formatter(self): self.assertEqual('', utils.link_formatter(None)) |