diff options
| author | ClairePhila <ClairePhila@byom.de> | 2017-02-10 18:28:16 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-02-10 14:34:14 -0500 |
| commit | 4101b57b1984af7f63eb5c7832861c30f2e7642d (patch) | |
| tree | 0c33cee67e6b96e4107c8e904487b6e841facdd0 /tests/model_fields | |
| parent | 0c21c49068cd283530a4b1822305d6dd7b7452ba (diff) | |
[1.11.x] Refs #27148 -- Fixed UUIDField.to_python(None) crash.
Regression in 2f9861d823620da7ecb291a8f005f53da12b1e89.
Backport of d26413113c1a5c95218fe4e43a684a2fe1ad1bff from master
Diffstat (limited to 'tests/model_fields')
| -rw-r--r-- | tests/model_fields/test_uuid.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/model_fields/test_uuid.py b/tests/model_fields/test_uuid.py index 5c87e4b0af..bc1c8d5bc0 100644 --- a/tests/model_fields/test_uuid.py +++ b/tests/model_fields/test_uuid.py @@ -54,13 +54,16 @@ class TestSaveLoad(TestCase): UUIDModel.objects.create(field='not-a-uuid') -class TestMigrations(SimpleTestCase): +class TestMethods(SimpleTestCase): def test_deconstruct(self): field = models.UUIDField() name, path, args, kwargs = field.deconstruct() self.assertEqual(kwargs, {}) + def test_to_python(self): + self.assertIsNone(models.UUIDField().to_python(None)) + class TestQuerying(TestCase): def setUp(self): @@ -88,6 +91,10 @@ class TestSerialization(SimpleTestCase): '[{"fields": {"field": "550e8400-e29b-41d4-a716-446655440000"}, ' '"model": "model_fields.uuidmodel", "pk": null}]' ) + nullable_test_data = ( + '[{"fields": {"field": null}, ' + '"model": "model_fields.nullableuuidmodel", "pk": null}]' + ) def test_dumping(self): instance = UUIDModel(field=uuid.UUID('550e8400e29b41d4a716446655440000')) @@ -98,6 +105,10 @@ class TestSerialization(SimpleTestCase): instance = list(serializers.deserialize('json', self.test_data))[0].object self.assertEqual(instance.field, uuid.UUID('550e8400-e29b-41d4-a716-446655440000')) + def test_nullable_loading(self): + instance = list(serializers.deserialize('json', self.nullable_test_data))[0].object + self.assertIsNone(instance.field) + class TestValidation(SimpleTestCase): def test_invalid_uuid(self): |
