x/wsme
Code Issues Proposed changes

A proper check of UuidType

Browse Source 
The validation method of the UuidType should return a valid value.

Change-Id: I0964f3b2a046df48cdf200d7896c60f331789eac
This commit is contained in:
Ilya Kharin 2014-02-26 19:22:01 +04:00
parent 228bfbd084
commit e896a74163
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wsme/tests/test_types.py
View File

@ -345,8 +345,10 @@ Value: 'v3'. Value should be one of: v., v.",
def test_validate_uuid_type(self): def test_validate_uuid_type(self):
v = types.UuidType() v = types.UuidType()
v.validate('6a0a707c-45ef-4758-b533-e55adddba8ce') self.assertEqual(v.validate('6a0a707c-45ef-4758-b533-e55adddba8ce'),
v.validate('6a0a707c45ef4758b533e55adddba8ce') '6a0a707c-45ef-4758-b533-e55adddba8ce')
self.assertEqual(v.validate('6a0a707c45ef4758b533e55adddba8ce'),
'6a0a707c-45ef-4758-b533-e55adddba8ce')
self.assertRaises(ValueError, v.validate, '') self.assertRaises(ValueError, v.validate, '')
self.assertRaises(ValueError, v.validate, 'foo') self.assertRaises(ValueError, v.validate, 'foo')
self.assertRaises(ValueError, v.validate, self.assertRaises(ValueError, v.validate,

2
wsme/types.py
View File

@ -270,7 +270,7 @@ class UuidType(UserType):
@staticmethod @staticmethod
def validate(value): def validate(value):
try: try:
uuid.UUID(value) return six.text_type((uuid.UUID(value)))
except (TypeError, ValueError, AttributeError): except (TypeError, ValueError, AttributeError):
error = 'Value should be UUID format' error = 'Value should be UUID format'
raise ValueError(error) raise ValueError(error)