Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #15548 -- Added an ordering clause to prevent test failures und…

…er Postgres. Thanks to bberes for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 185b4f49ca2e61c62208425c06bb6a19a25eaca3 1 parent 806bffc
Russell Keith-Magee authored March 04, 2011
3  tests/regressiontests/modeladmin/models.py
@@ -9,6 +9,9 @@ class Band(models.Model):
9 9
     bio = models.TextField()
10 10
     sign_date = models.DateField()
11 11
 
  12
+    class Meta:
  13
+        ordering = ('name',)
  14
+
12 15
     def __unicode__(self):
13 16
         return self.name
14 17
 
4  tests/regressiontests/modeladmin/tests.py
@@ -154,9 +154,9 @@ class ConcertAdmin(ModelAdmin):
154 154
         self.assertEqual(str(form["main_band"]),
155 155
             '<select name="main_band" id="id_main_band">\n'
156 156
             '<option value="" selected="selected">---------</option>\n'
157  
-            '<option value="%d">The Doors</option>\n'
158 157
             '<option value="%d">The Beatles</option>\n'
159  
-            '</select>' % (self.band.id, band2.id))
  158
+            '<option value="%d">The Doors</option>\n'
  159
+            '</select>' % (band2.id, self.band.id))
160 160
 
161 161
         class AdminConcertForm(forms.ModelForm):
162 162
             class Meta:

0 notes on commit 185b4f4

Please sign in to comment.
Something went wrong with that request. Please try again.