p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a dependence on set-ordering in tests

This commit is contained in:
Luke Plant 2012-12-24 01:33:44 +00:00
parent c31c2c92b8
commit 1ae64e96c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/regressiontests/admin_filters/tests.py
View File

@ -83,11 +83,11 @@ class DepartmentListFilterLookupWithNonStringValue(SimpleListFilter):
parameter_name = 'department' parameter_name = 'department'
def lookups(self, request, model_admin): def lookups(self, request, model_admin):
return set([ return sorted(set([
(employee.department.id, # Intentionally not a string (Refs #19318) (employee.department.id, # Intentionally not a string (Refs #19318)
employee.department.code) employee.department.code)
for employee in model_admin.queryset(request).all() for employee in model_admin.queryset(request).all()
]) ]))
def queryset(self, request, queryset): def queryset(self, request, queryset):
if self.value(): if self.value():
@ -683,9 +683,9 @@ class ListFiltersTests(TestCase):
filterspec = changelist.get_filters(request)[0][-1] filterspec = changelist.get_filters(request)[0][-1]
self.assertEqual(force_text(filterspec.title), 'department') self.assertEqual(force_text(filterspec.title), 'department')
choices = list(filterspec.choices(changelist)) choices = list(filterspec.choices(changelist))
self.assertEqual(choices[2]['display'], 'DEV') self.assertEqual(choices[1]['display'], 'DEV')
self.assertEqual(choices[2]['selected'], True) self.assertEqual(choices[1]['selected'], True)
self.assertEqual(choices[2]['query_string'], '?department=%s' % self.john.pk) self.assertEqual(choices[1]['query_string'], '?department=%s' % self.john.pk)
def test_fk_with_to_field(self): def test_fk_with_to_field(self):
""" """