From 185b4f49ca2e61c62208425c06bb6a19a25eaca3 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 4 Mar 2011 00:01:56 +0000
Subject: [PATCH] Fixed #15548 -- Added an ordering clause to prevent test
 failures under Postgres. Thanks to bberes for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/regressiontests/modeladmin/models.py | 3 +++
 tests/regressiontests/modeladmin/tests.py  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/regressiontests/modeladmin/models.py b/tests/regressiontests/modeladmin/models.py
index cb2e3d1b0b..2eda54e7fb 100644
--- a/tests/regressiontests/modeladmin/models.py
+++ b/tests/regressiontests/modeladmin/models.py
@@ -9,6 +9,9 @@ class Band(models.Model):
     bio = models.TextField()
     sign_date = models.DateField()
 
+    class Meta:
+        ordering = ('name',)
+
     def __unicode__(self):
         return self.name
 
diff --git a/tests/regressiontests/modeladmin/tests.py b/tests/regressiontests/modeladmin/tests.py
index 4487da4377..a20e579026 100644
--- a/tests/regressiontests/modeladmin/tests.py
+++ b/tests/regressiontests/modeladmin/tests.py
@@ -154,9 +154,9 @@ class ModelAdminTests(TestCase):
         self.assertEqual(str(form["main_band"]),
             '<select name="main_band" id="id_main_band">\n'
             '<option value="" selected="selected">---------</option>\n'
-            '<option value="%d">The Doors</option>\n'
             '<option value="%d">The Beatles</option>\n'
-            '</select>' % (self.band.id, band2.id))
+            '<option value="%d">The Doors</option>\n'
+            '</select>' % (band2.id, self.band.id))
 
         class AdminConcertForm(forms.ModelForm):
             class Meta: