diff options
| author | Anssi Kääriäinen <akaariai@gmail.com> | 2012-11-24 15:52:00 +0200 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2012-11-24 16:10:16 +0200 |
| commit | 3e4058be9f3f7bc58a356278a70d44c07f1c967c (patch) | |
| tree | 4e41288b9bb32116a61883f5cb3c986a79cd6d66 | |
| parent | 046300c43b44c3238e980f01c177170ed4efde34 (diff) | |
[1.4.x] Fixed ordering-related failure in m2m_through_regress tests
Backpatch of dc569c880143db07e01b3293d698ad8fe4a0136f
| -rw-r--r-- | tests/regressiontests/m2m_through_regress/models.py | 3 | ||||
| -rw-r--r-- | tests/regressiontests/m2m_through_regress/tests.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/regressiontests/m2m_through_regress/models.py b/tests/regressiontests/m2m_through_regress/models.py index 9cd1475fd5..8f812c9459 100644 --- a/tests/regressiontests/m2m_through_regress/models.py +++ b/tests/regressiontests/m2m_through_regress/models.py @@ -66,6 +66,9 @@ class Driver(models.Model): def __unicode__(self): return "%s" % self.name + class Meta: + ordering = ('name',) + class CarDriver(models.Model): car = models.ForeignKey('Car', to_field='make') driver = models.ForeignKey('Driver', to_field='name') diff --git a/tests/regressiontests/m2m_through_regress/tests.py b/tests/regressiontests/m2m_through_regress/tests.py index d215f83af2..a3b57dfd6a 100644 --- a/tests/regressiontests/m2m_through_regress/tests.py +++ b/tests/regressiontests/m2m_through_regress/tests.py @@ -172,7 +172,7 @@ class ToFieldThroughTests(TestCase): self.car.drivers._add_items('car', 'driver', self.unused_driver) self.assertQuerysetEqual( self.car.drivers.all(), - ["<Driver: Ryan Briscoe>", "<Driver: Barney Gumble>"] + ["<Driver: Barney Gumble>", "<Driver: Ryan Briscoe>"] ) def test_add_null(self): |