From 2f9861d823620da7ecb291a8f005f53da12b1e89 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 31 Oct 2016 15:21:05 -0400 Subject: Fixed #27148 -- Fixed ModelMultipleChoiceField crash with invalid UUID. --- tests/model_fields/test_uuid.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/model_fields') diff --git a/tests/model_fields/test_uuid.py b/tests/model_fields/test_uuid.py index 1c173e526d..1e032ce9b0 100644 --- a/tests/model_fields/test_uuid.py +++ b/tests/model_fields/test_uuid.py @@ -40,17 +40,17 @@ class TestSaveLoad(TestCase): self.assertIsNone(loaded.field) def test_pk_validated(self): - with self.assertRaisesMessage(TypeError, 'is not a valid UUID'): + with self.assertRaisesMessage(exceptions.ValidationError, 'is not a valid UUID'): PrimaryKeyUUIDModel.objects.get(pk={}) - with self.assertRaisesMessage(TypeError, 'is not a valid UUID'): + with self.assertRaisesMessage(exceptions.ValidationError, 'is not a valid UUID'): PrimaryKeyUUIDModel.objects.get(pk=[]) def test_wrong_value(self): - with self.assertRaisesMessage(ValueError, 'badly formed hexadecimal UUID string'): + with self.assertRaisesMessage(exceptions.ValidationError, 'is not a valid UUID'): UUIDModel.objects.get(field='not-a-uuid') - with self.assertRaisesMessage(ValueError, 'badly formed hexadecimal UUID string'): + with self.assertRaisesMessage(exceptions.ValidationError, 'is not a valid UUID'): UUIDModel.objects.create(field='not-a-uuid') -- cgit v1.3