Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.5.x] Fixed a dependence on set-ordering in tests

Backport of 1ae64e9 from master
  • Loading branch information...
commit 00aea69f06b5eb2f7f22e5422382cabe561c449f 1 parent b362a55
@spookylukey spookylukey authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 tests/regressiontests/admin_filters/tests.py
View
10 tests/regressiontests/admin_filters/tests.py
@@ -83,11 +83,11 @@ class DepartmentListFilterLookupWithNonStringValue(SimpleListFilter):
parameter_name = 'department'
def lookups(self, request, model_admin):
- return set([
+ return sorted(set([
(employee.department.id, # Intentionally not a string (Refs #19318)
employee.department.code)
for employee in model_admin.queryset(request).all()
- ])
+ ]))
def queryset(self, request, queryset):
if self.value():
@@ -683,9 +683,9 @@ def test_lookup_with_non_string_value(self):
filterspec = changelist.get_filters(request)[0][-1]
self.assertEqual(force_text(filterspec.title), 'department')
choices = list(filterspec.choices(changelist))
- self.assertEqual(choices[2]['display'], 'DEV')
- self.assertEqual(choices[2]['selected'], True)
- self.assertEqual(choices[2]['query_string'], '?department=%s' % self.john.pk)
+ self.assertEqual(choices[1]['display'], 'DEV')
+ self.assertEqual(choices[1]['selected'], True)
+ self.assertEqual(choices[1]['query_string'], '?department=%s' % self.john.pk)
def test_fk_with_to_field(self):
"""

0 comments on commit 00aea69

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