innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1622 from manfre/ticket-21099 

Fixed #21099 - Skip DistinctOnTests unless backend can_distinct_on_field...
This commit is contained in:
Claude Paroz 2013-09-12 12:53:24 -07:00
parent 4c5641dd92 018037736f
commit e4c6fca6d2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/distinct_on_fields/tests.py
View File

@ -6,6 +6,7 @@ from django.test.utils import str_prefix
from .models import Tag, Celebrity, Fan, Staff, StaffTag from .models import Tag, Celebrity, Fan, Staff, StaffTag
@skipUnlessDBFeature('can_distinct_on_fields')
class DistinctOnTests(TestCase): class DistinctOnTests(TestCase):
def setUp(self): def setUp(self):
t1 = Tag.objects.create(name='t1') t1 = Tag.objects.create(name='t1')
@ -29,7 +30,6 @@ class DistinctOnTests(TestCase):
self.fan2 = Fan.objects.create(fan_of=celeb1) self.fan2 = Fan.objects.create(fan_of=celeb1)
self.fan3 = Fan.objects.create(fan_of=celeb2) self.fan3 = Fan.objects.create(fan_of=celeb2)
@skipUnlessDBFeature('can_distinct_on_fields')
def test_basic_distinct_on(self): def test_basic_distinct_on(self):
"""QuerySet.distinct('field', ...) works""" """QuerySet.distinct('field', ...) works"""
# (qset, expected) tuples # (qset, expected) tuples
@ -101,7 +101,6 @@ class DistinctOnTests(TestCase):
c2 = c1.distinct('pk') c2 = c1.distinct('pk')
self.assertNotIn('OUTER JOIN', str(c2.query)) self.assertNotIn('OUTER JOIN', str(c2.query))
@skipUnlessDBFeature('can_distinct_on_fields')
def test_distinct_not_implemented_checks(self): def test_distinct_not_implemented_checks(self):
# distinct + annotate not allowed # distinct + annotate not allowed
with self.assertRaises(NotImplementedError): with self.assertRaises(NotImplementedError):