test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected a suite of test failures when running under postgres. Backport of [14241]. 

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2010-10-17 01:50:58 +00:00
parent 11713a8771
commit 2a33115040
2 changed files with 5 additions and 5 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(), [