diff options
| author | Ilya Kharin <akscram@gmail.com> | 2014-02-26 19:22:01 +0400 |
|---|---|---|
| committer | Ilya Kharin <akscram@gmail.com> | 2014-02-26 19:22:01 +0400 |
| commit | e896a7416360a2ffdb2563acaeb65e8ab7d03ed2 (patch) | |
| tree | a1ae9bc7d02efc9d3c8f4ecbf4473778c0ae52ab | |
| parent | 228bfbd084ff2c4653740696d26ed10748aaa33c (diff) | |
| download | wsme-e896a7416360a2ffdb2563acaeb65e8ab7d03ed2.tar.gz | |
A proper check of UuidType
The validation method of the UuidType should return a valid value.
Change-Id: I0964f3b2a046df48cdf200d7896c60f331789eac
| -rw-r--r-- | wsme/tests/test_types.py | 6 | ||||
| -rw-r--r-- | wsme/types.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/wsme/tests/test_types.py b/wsme/tests/test_types.py index a0a3cd1..c3805a2 100644 --- a/wsme/tests/test_types.py +++ b/wsme/tests/test_types.py @@ -345,8 +345,10 @@ Value: 'v3'. Value should be one of: v., v.", def test_validate_uuid_type(self): v = types.UuidType() - v.validate('6a0a707c-45ef-4758-b533-e55adddba8ce') - v.validate('6a0a707c45ef4758b533e55adddba8ce') + self.assertEqual(v.validate('6a0a707c-45ef-4758-b533-e55adddba8ce'), + '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, 'foo') self.assertRaises(ValueError, v.validate, diff --git a/wsme/types.py b/wsme/types.py index 9701a61..623996b 100644 --- a/wsme/types.py +++ b/wsme/types.py @@ -270,7 +270,7 @@ class UuidType(UserType): @staticmethod def validate(value): try: - uuid.UUID(value) + return six.text_type((uuid.UUID(value))) except (TypeError, ValueError, AttributeError): error = 'Value should be UUID format' raise ValueError(error) |