Merge pull request #4909 from juliantaylor/py3-testfix

sort dictionary keys before comparison, ordering is not guaranteed

IPython/core/tests/test_interactiveshell.py

@@ -655,7 +655,7 b' def test_user_expression():'
     r = ip.user_expressions(query)
     import pprint
     pprint.pprint(r)
-    nt.assert_equal(r.keys(), query.keys())
+    nt.assert_equal(set(r.keys()), set(query.keys()))
     a = r['a']
     nt.assert_equal(set(['status', 'data', 'metadata']), set(a.keys()))
     nt.assert_equal(a['status'], 'ok')