mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 18:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removed references to the deprecated assertRaisesRegexp method.

Browse source
This commit is contained in:
Simon Charette 2014-11-16 02:05:54 +01:00
parent 5b9470efd8
commit 68ef44c565
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/annotations/tests.py
View file

@ -9,6 +9,7 @@ from django.db.models import (
IntegerField, BooleanField, CharField)
from django.db.models.fields import FieldDoesNotExist
from django.test import TestCase
from django.utils import six
from .models import Author, Book, Store, DepartmentStore, Company, Employee
@ -75,7 +76,7 @@ class NonAggregateAnnotationTestCase(TestCase):
self.assertEqual(book.sum_rating, book.rating)
def test_filter_wrong_annotation(self):
with self.assertRaisesRegexp(FieldError, "Cannot resolve keyword .*"):
with six.assertRaisesRegex(self, FieldError, "Cannot resolve keyword .*"):
list(Book.objects.annotate(
sum_rating=Sum('rating')
).filter(sum_rating=F('nope')))
@ -137,7 +138,7 @@ class NonAggregateAnnotationTestCase(TestCase):
self.assertEqual(book.rating, 5)
self.assertEqual(book.other_rating, 4)
with self.assertRaisesRegexp(FieldDoesNotExist, "\w has no field named u?'other_rating'"):
with six.assertRaisesRegex(self, FieldDoesNotExist, "\w has no field named u?'other_rating'"):
book = qs.defer('other_rating').get(other_rating=4)
def test_mti_annotations(self):