Commit c4e240fa authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #11392 -- Enforced a predictable result order for a couple of... 

[1.0.X] Fixed #11392 -- Enforced a predictable result order for a couple of test cases. Thanks to Nathan Auch for the report and patch.

Merge of r11119 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 74b63166

tests/modeltests/transactions/models.py

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ class Reporter(models.Model): 
    last_name = models.CharField(max_length=30)

    email = models.EmailField()



    class Meta:

        ordering = ('first_name', 'last_name')



    def __unicode__(self):

        return u"%s %s" % (self.first_name, self.last_name)

tests/regressiontests/null_fk/models.py

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ class Comment(models.Model): 
    post = models.ForeignKey(Post, null=True)

    comment_text = models.CharField(max_length=250)



    class Meta:

        ordering = ('comment_text',)



    def __unicode__(self):

        return self.comment_text

tests/regressiontests/serializers_regress/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ def data_compare(testcase, pk, klass, data): 
def generic_compare(testcase, pk, klass, data):

    instance = klass.objects.get(id=pk)

    testcase.assertEqual(data[0], instance.data)

    testcase.assertEqual(data[1:], [t.data for t in instance.tags.all()])

    testcase.assertEqual(data[1:], [t.data for t in instance.tags.order_by('id')])



def fk_compare(testcase, pk, klass, data):

    instance = klass.objects.get(id=pk)
@@ -111,7 +111,7 @@ def fk_compare(testcase, pk, klass, data): 


def m2m_compare(testcase, pk, klass, data):

    instance = klass.objects.get(id=pk)

    testcase.assertEqual(data, [obj.id for obj in instance.data.all()])

    testcase.assertEqual(data, [obj.id for obj in instance.data.order_by('id')])



def im2m_compare(testcase, pk, klass, data):

    instance = klass.objects.get(id=pk)