Fixed various tests on MySQL with MyISAM storage engine.

1 files changed, 24 insertions, 26 deletions

diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py
index 1fcb506b51..d542bcd3ec 100644
--- a/tests/admin_filters/tests.py
+++ b/tests/admin_filters/tests.py
@@ -1440,19 +1440,18 @@ class ListFiltersTests(TestCase):
 
         filterspec = changelist.get_filters(request)[0][-1]
         self.assertEqual(filterspec.title, "department")
-        choices = list(filterspec.choices(changelist))
-
-        self.assertEqual(choices[0]["display"], "All")
-        self.assertIs(choices[0]["selected"], True)
-        self.assertEqual(choices[0]["query_string"], "?")
-
-        self.assertEqual(choices[1]["display"], "Development")
-        self.assertIs(choices[1]["selected"], False)
-        self.assertEqual(choices[1]["query_string"], "?department__code__exact=DEV")
-
-        self.assertEqual(choices[2]["display"], "Design")
-        self.assertIs(choices[2]["selected"], False)
-        self.assertEqual(choices[2]["query_string"], "?department__code__exact=DSN")
+        choices = [
+            (choice["display"], choice["selected"], choice["query_string"])
+            for choice in filterspec.choices(changelist)
+        ]
+        self.assertCountEqual(
+            choices,
+            [
+                ("All", True, "?"),
+                ("Development", False, "?department__code__exact=DEV"),
+                ("Design", False, "?department__code__exact=DSN"),
+            ],
+        )
 
         # Filter by Department=='Development' --------------------------------
 
@@ -1466,19 +1465,18 @@ class ListFiltersTests(TestCase):
 
         filterspec = changelist.get_filters(request)[0][-1]
         self.assertEqual(filterspec.title, "department")
-        choices = list(filterspec.choices(changelist))
-
-        self.assertEqual(choices[0]["display"], "All")
-        self.assertIs(choices[0]["selected"], False)
-        self.assertEqual(choices[0]["query_string"], "?")
-
-        self.assertEqual(choices[1]["display"], "Development")
-        self.assertIs(choices[1]["selected"], True)
-        self.assertEqual(choices[1]["query_string"], "?department__code__exact=DEV")
-
-        self.assertEqual(choices[2]["display"], "Design")
-        self.assertIs(choices[2]["selected"], False)
-        self.assertEqual(choices[2]["query_string"], "?department__code__exact=DSN")
+        choices = [
+            (choice["display"], choice["selected"], choice["query_string"])
+            for choice in filterspec.choices(changelist)
+        ]
+        self.assertCountEqual(
+            choices,
+            [
+                ("All", False, "?"),
+                ("Development", True, "?department__code__exact=DEV"),
+                ("Design", False, "?department__code__exact=DSN"),
+            ],
+        )
 
     def test_lookup_with_dynamic_value(self):
         """