diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2012-12-24 01:33:44 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2012-12-24 01:33:44 +0000 |
| commit | 1ae64e96c161229a74efc4235917dcaae7e9cd05 (patch) | |
| tree | c127c9359bd2da8038a54541a70ba21dc4443280 | |
| parent | c31c2c92b8ef0b58394ac55fa4f61acc07091047 (diff) | |
Fixed a dependence on set-ordering in tests
| -rw-r--r-- | tests/regressiontests/admin_filters/tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/regressiontests/admin_filters/tests.py b/tests/regressiontests/admin_filters/tests.py index 8a23f1c9d5..11f792e07a 100644 --- a/tests/regressiontests/admin_filters/tests.py +++ b/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 @@ class ListFiltersTests(TestCase): 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): """ |
