Merge pull request #531 from mgorny/pypy-chainmap

Sort before comparing dicts in TestChainMap

Author: jmadler

tests/test_future/test_backports.py

@@ -87,7 +87,8 @@ def test_basics(self):
         d['b'] = 20
         d['c'] = 30
         self.assertEqual(d.maps, [{'b':20, 'c':30}, {'a':1, 'b':2}])  # check internal state
-        self.assertEqual(d.items(), dict(a=1, b=20, c=30).items())    # check items/iter/getitem
+        self.assertEqual(sorted(d.items()),
+                         sorted(dict(a=1, b=20, c=30).items()))       # check items/iter/getitem
         self.assertEqual(len(d), 3)                                   # check len
         for key in 'abc':                                             # check contains
             self.assertIn(key, d)
@@ -96,7 +97,8 @@ def test_basics(self):
 
         del d['b']                                                    # unmask a value
         self.assertEqual(d.maps, [{'c':30}, {'a':1, 'b':2}])          # check internal state
-        self.assertEqual(d.items(), dict(a=1, b=2, c=30).items())     # check items/iter/getitem
+        self.assertEqual(sorted(d.items()),
+                         sorted(dict(a=1, b=2, c=30).items()))        # check items/iter/getitem
         self.assertEqual(len(d), 3)                                   # check len
         for key in 'abc':                                             # check contains
             self.assertIn(key, d)