diff options
| author | Tim Graham <timograham@gmail.com> | 2015-02-12 09:54:42 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-12 10:17:31 -0500 |
| commit | 8d1816db87e9e700d9bd5336ac25686fdf30c789 (patch) | |
| tree | a934ebee0be580debc4bddcc07796267b1a1e9d3 | |
| parent | 7b5aa20a281d1df27a9d94dd591845838a3cc804 (diff) | |
[1.8.x] Added a test for UUIDField serialization; refs #24320.
Backport of d7509c52466aeffb13ccd8a86475e74fdb0e6292 from master
| -rw-r--r-- | tests/serializers_regress/models.py | 4 | ||||
| -rw-r--r-- | tests/serializers_regress/tests.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/serializers_regress/models.py b/tests/serializers_regress/models.py index fd80863916..b7c4575c6d 100644 --- a/tests/serializers_regress/models.py +++ b/tests/serializers_regress/models.py @@ -280,6 +280,10 @@ class SmallPKData(models.Model): # data = models.TimeField(primary_key=True) +class UUIDData(models.Model): + data = models.UUIDField(primary_key=True) + + class ComplexModel(models.Model): field1 = models.CharField(max_length=10) field2 = models.CharField(max_length=10) diff --git a/tests/serializers_regress/tests.py b/tests/serializers_regress/tests.py index 5ec850cf62..71a19f7381 100644 --- a/tests/serializers_regress/tests.py +++ b/tests/serializers_regress/tests.py @@ -10,6 +10,7 @@ from __future__ import unicode_literals import datetime import decimal +import uuid from unittest import skipUnless from django.core import serializers @@ -36,7 +37,7 @@ from .models import ( NullBooleanData, O2OData, PositiveIntegerData, PositiveIntegerPKData, PositiveSmallIntegerData, PositiveSmallIntegerPKData, ProxyBaseModel, ProxyProxyBaseModel, SlugData, SlugPKData, SmallData, SmallPKData, Tag, - TextData, TimeData, UniqueAnchor, + TextData, TimeData, UniqueAnchor, UUIDData, ) try: @@ -360,6 +361,7 @@ The end."""), # The end."""), # (pk_obj, 770, TimePKData, datetime.time(10, 42, 37)), # (pk_obj, 790, XMLPKData, "<foo></foo>"), + (pk_obj, 791, UUIDData, uuid.uuid4()), (data_obj, 800, AutoNowDateTimeData, datetime.datetime(2006, 6, 16, 10, 42, 37)), (data_obj, 810, ModifyingSaveData, 42), |
