Made a test compatible with Python 2 and 3.

django · Jun 7, 2014 · d98cc41 · d98cc41
1 parent 11284a6
commit d98cc41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/django/utils/six.py b/django/utils/six.py
@@ -663,10 +663,12 @@ def wrapper(cls):
 ### Additional customizations for Django ###
 
 if PY3:
+    _assertCountEqual = "assertCountEqual"
     _assertRaisesRegex = "assertRaisesRegex"
     _assertRegex = "assertRegex"
     memoryview = memoryview
 else:
+    _assertCountEqual = "assertItemsEqual"
     _assertRaisesRegex = "assertRaisesRegexp"
     _assertRegex = "assertRegexpMatches"
     # memoryview and buffer are not strictly equivalent, but should be fine for
@@ -678,6 +680,10 @@ def wrapper(cls):
         memoryview = buffer
 
 
+def assertCountEqual(self, *args, **kwargs):
+    return getattr(self, _assertCountEqual)(*args, **kwargs)
+
+
 def assertRaisesRegex(self, *args, **kwargs):
     return getattr(self, _assertRaisesRegex)(*args, **kwargs)
 

diff --git a/tests/backends/tests.py b/tests/backends/tests.py
@@ -681,7 +681,7 @@ def test_queries(self):
 
         self.assertIsInstance(connection.queries, list)
         self.assertIsInstance(connection.queries[0], dict)
-        self.assertItemsEqual(connection.queries[0].keys(), ['sql', 'time'])
+        six.assertCountEqual(self, connection.queries[0].keys(), ['sql', 'time'])
 
         reset_queries()
         self.assertEqual(0, len(connection.queries))