p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Corrected a suite of test failures when running under postgres. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2010-10-17 01:49:36 +00:00
parent d931f43b70
commit cd63ce077d
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/modeltests/generic_relations/models.py
View File

@ -23,7 +23,7 @@ class TaggedItem(models.Model):
content_object = generic.GenericForeignKey()
class Meta:
ordering = ["tag", "-object_id"]
ordering = ["tag", "content_type__name"]
def __unicode__(self):
return self.tag

8
tests/modeltests/generic_relations/tests.py
View File

@ -88,8 +88,8 @@ class GenericRelationsTests(TestCase):
self.assertQuerysetEqual(TaggedItem.objects.all(), [
(u'clearish', Mineral, quartz.pk),
(u'fatty', Vegetable, bacon.pk),
(u'fatty', Animal, platypus.pk),
(u'fatty', Vegetable, bacon.pk),
(u'hairy', Animal, lion.pk),
(u'salty', Vegetable, bacon.pk),
(u'shiny', Animal, platypus.pk),
@ -100,8 +100,8 @@ class GenericRelationsTests(TestCase):
lion.delete()
self.assertQuerysetEqual(TaggedItem.objects.all(), [
(u'clearish', Mineral, quartz.pk),
(u'fatty', Vegetable, bacon.pk),
(u'fatty', Animal, platypus.pk),
(u'fatty', Vegetable, bacon.pk),
(u'salty', Vegetable, bacon.pk),
(u'shiny', Animal, platypus.pk)
],
@ -114,8 +114,8 @@ class GenericRelationsTests(TestCase):
quartz.delete()
self.assertQuerysetEqual(TaggedItem.objects.all(), [
(u'clearish', Mineral, quartz_pk),
(u'fatty', Vegetable, bacon.pk),
(u'fatty', Animal, platypus.pk),
(u'fatty', Vegetable, bacon.pk),
(u'salty', Vegetable, bacon.pk),
(u'shiny', Animal, platypus.pk)
],
@ -123,7 +123,7 @@ class GenericRelationsTests(TestCase):
)
# If you delete a tag, the objects using the tag are unaffected
# (other than losing a tag)
tag = TaggedItem.objects.get(id=1)
tag = TaggedItem.objects.order_by("id")[0]
tag.delete()
self.assertQuerysetEqual(bacon.tags.all(), ["<TaggedItem: salty>"])
self.assertQuerysetEqual(TaggedItem.objects.all(), [

8
tests/regressiontests/test_utils/python_25.py
View File

@ -11,13 +11,11 @@ class AssertNumQueriesTests(TestCase):
pass
with self.assertNumQueries(1):
# Guy who wrote Linux
Person.objects.create(name="Linus Torvalds")
Person.objects.count()
with self.assertNumQueries(2):
# Guy who owns the bagel place I like
Person.objects.create(name="Uncle Ricky")
self.assertEqual(Person.objects.count(), 2)
Person.objects.count()
Person.objects.count()
def test_failure(self):
with self.assertRaises(AssertionError) as exc_info: