From 0efca2a8198f5e7a702c0fbb38be489a6bd23ef5 Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Fri, 26 Oct 2012 02:00:21 +0100
Subject: [PATCH] [1.5.x] Fixed test failures on Python 3.3 due to dict
 ordering assumptions.

Refs #19038

Backport of c229f31118bd8a7494692a727860ed7cb58df232 from master
---
 tests/regressiontests/utils/datastructures.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/regressiontests/utils/datastructures.py b/tests/regressiontests/utils/datastructures.py
index 7c81ccd172..457ae85801 100644
--- a/tests/regressiontests/utils/datastructures.py
+++ b/tests/regressiontests/utils/datastructures.py
@@ -212,19 +212,18 @@ class MultiValueDictTests(SimpleTestCase):
         self.assertEqual(d['name'], 'Simon')
         self.assertEqual(d.get('name'), 'Simon')
         self.assertEqual(d.getlist('name'), ['Adrian', 'Simon'])
-        self.assertEqual(list(six.iteritems(d)),
-                          [('position', 'Developer'), ('name', 'Simon')])
+        self.assertEqual(sorted(list(six.iteritems(d))),
+                          [('name', 'Simon'), ('position', 'Developer')])
 
-        self.assertEqual(list(six.iterlists(d)),
-                          [('position', ['Developer']),
-                           ('name', ['Adrian', 'Simon'])])
+        self.assertEqual(sorted(list(six.iterlists(d))),
+                          [('name', ['Adrian', 'Simon']),
+                           ('position', ['Developer'])])
 
         # MultiValueDictKeyError: "Key 'lastname' not found in
         # <MultiValueDict: {'position': ['Developer'],
         #                   'name': ['Adrian', 'Simon']}>"
-        self.assertRaisesMessage(MultiValueDictKeyError,
-            '"Key \'lastname\' not found in <MultiValueDict: {\'position\':'\
-            ' [\'Developer\'], \'name\': [\'Adrian\', \'Simon\']}>"',
+        self.assertRaisesRegex(MultiValueDictKeyError,
+            r'"Key \'lastname\' not found in <MultiValueDict',
             d.__getitem__, 'lastname')
 
         self.assertEqual(d.get('lastname'), None)
@@ -235,8 +234,8 @@ class MultiValueDictTests(SimpleTestCase):
 
         d.setlist('lastname', ['Holovaty', 'Willison'])
         self.assertEqual(d.getlist('lastname'), ['Holovaty', 'Willison'])
-        self.assertEqual(list(six.itervalues(d)),
-                          ['Developer', 'Simon', 'Willison'])
+        self.assertEqual(sorted(list(six.itervalues(d))),
+                         ['Developer', 'Simon', 'Willison'])
 
     def test_appendlist(self):
         d = MultiValueDict()