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:05:30 +0200 |
| commit | 0d3ec8d0fb74424bb49e3169d5d051a36e8d2348 (patch) | |
| tree | 2ed650d65787c5be11bd2b944e74f5d5f9d61c35 | |
| parent | 9efe1a7210ee161d5688f66a759bcd8d89d33142 (diff) | |
[1.5.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 23d3366f22..91e1aa8cc1 100644 --- a/tests/regressiontests/m2m_through_regress/models.py +++ b/tests/regressiontests/m2m_through_regress/models.py @@ -75,6 +75,9 @@ class Driver(models.Model): def __str__(self): return "%s" % self.name + class Meta: + ordering = ('name',) + @python_2_unicode_compatible class CarDriver(models.Model): car = models.ForeignKey('Car', to_field='make') diff --git a/tests/regressiontests/m2m_through_regress/tests.py b/tests/regressiontests/m2m_through_regress/tests.py index 828ec3618c..eba956b3ba 100644 --- a/tests/regressiontests/m2m_through_regress/tests.py +++ b/tests/regressiontests/m2m_through_regress/tests.py @@ -168,7 +168,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): |