diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-02-10 02:10:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-02-10 02:10:40 +0000 |
| commit | 96870fba163ca6ab9085d05810295f2d2b970d47 (patch) | |
| tree | c853a6f6f38ecb4f69cceba60685ad6f7df36f9f | |
| parent | 5d4b8b534236c22a55fca369f17364b25fcaa081 (diff) | |
| parent | 788e05c0df1fb5e94ae355b2929000445006d8f2 (diff) | |
| download | python-novaclient-96870fba163ca6ab9085d05810295f2d2b970d47.tar.gz | |
Merge "Fixed multi validation and wrong fail calls in unit tests"
| -rw-r--r-- | novaclient/tests/test_utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/novaclient/tests/test_utils.py b/novaclient/tests/test_utils.py index cce2db02..ba680119 100644 --- a/novaclient/tests/test_utils.py +++ b/novaclient/tests/test_utils.py @@ -291,14 +291,13 @@ class FlattenTestCase(test_utils.TestCase): class ValidationsTestCase(test_utils.TestCase): def test_validate_flavor_metadata_keys_with_valid_keys(self): valid_keys = ['key1', 'month.price', 'I-Am:AK-ey.01-', 'spaces and _'] - for key in valid_keys: - utils.validate_flavor_metadata_keys(valid_keys) + utils.validate_flavor_metadata_keys(valid_keys) def test_validate_flavor_metadata_keys_with_invalid_keys(self): invalid_keys = ['/1', '?1', '%1', '<', '>', '\1'] for key in invalid_keys: try: utils.validate_flavor_metadata_keys([key]) - self.assertFail() + self.fail("Invalid key passed validation: %s" % key) except exceptions.CommandError as ce: self.assertTrue(key in str(ce)) |