x/wsme
Code Issues Proposed changes

Merge "Remove the duplicated error message from Enum"

Browse Source
This commit is contained in:
Jenkins 2013-10-31 23:19:30 +00:00 committed by Gerrit Code Review
commit c63ad8bbfe
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wsme/tests/test_api.py
View File

@ -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'])

2
wsme/tests/test_types.py
View File

@ -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',

2
wsme/types.py
View File

@ -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