diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-31 23:19:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-31 23:19:30 +0000 |
| commit | c63ad8bbfea78957d79bbb4a573cee97e0a8bd66 (patch) | |
| tree | e630c9271d4620acda469cabcd89c62c8e1b4695 | |
| parent | db6c337526a6dbba11d260537f1eb95e7cabac4f (diff) | |
| parent | 29547eae59d244adb681b6182b604e7085d8c1a8 (diff) | |
| download | wsme-c63ad8bbfea78957d79bbb4a573cee97e0a8bd66.tar.gz | |
Merge "Remove the duplicated error message from Enum"
| -rw-r--r-- | wsme/tests/test_api.py | 4 | ||||
| -rw-r--r-- | wsme/tests/test_types.py | 2 | ||||
| -rw-r--r-- | wsme/types.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/wsme/tests/test_api.py b/wsme/tests/test_api.py index 008a928..db85c51 100644 --- a/wsme/tests/test_api.py +++ b/wsme/tests/test_api.py @@ -80,7 +80,7 @@ class TestController(unittest.TestCase): self.assertTrue( res.json_body['faultstring'].startswith( "Invalid input for field/attribute number. Value: 'arf'. \ -Invalid value (should be one of:")) +Value should be one of:")) self.assertIn('v1', res.json_body['faultstring']) self.assertIn('v2', res.json_body['faultstring']) self.assertIn('None', res.json_body['faultstring']) @@ -104,7 +104,7 @@ Invalid value (should be one of:")) self.assertTrue( res.json_body['faultstring'].startswith( "Invalid input for field/attribute number. Value: '1'. \ -Invalid value (should be one of:")) +Value should be one of:")) self.assertIn('v1', res.json_body['faultstring']) self.assertIn('v2', res.json_body['faultstring']) self.assertIn('None', res.json_body['faultstring']) diff --git a/wsme/tests/test_types.py b/wsme/tests/test_types.py index 93c20fe..e40bd7d 100644 --- a/wsme/tests/test_types.py +++ b/wsme/tests/test_types.py @@ -182,7 +182,7 @@ class TestTypes(unittest.TestCase): self.assertRaisesRegexp(exc.InvalidInput, "Invalid input for field/attribute a. \ -Value: 'v3'. Invalid value \(should be one of: v., v.\)", +Value: 'v3'. Value should be one of: v., v.", setattr, obj, 'a', diff --git a/wsme/types.py b/wsme/types.py index 18b032f..991450b 100644 --- a/wsme/types.py +++ b/wsme/types.py @@ -161,7 +161,7 @@ class Enum(UserType): def validate(self, value): if value not in self.values: - raise ValueError("Invalid value (should be one of: %s)" % + raise ValueError("Value should be one of: %s" % ', '.join(map(six.text_type, self.values))) return value |