Fix object sort order in tools tests

pythonFiles/tests/testing_tools/adapter/test_functional.py

@@ -83,6 +83,14 @@ def fix_source(tests, testid, srcfile, lineno):
     test["source"] = fix_path("{}:{}".format(srcfile, lineno))
 
 
+def sorted_object(obj):
+    if isinstance(obj, dict):
+        return sorted((key, sorted_object(obj[key])) for key in obj.keys())
+    if isinstance(obj, list):
+        return sorted((sorted_object(x) for x in obj))
+    else:
+        return obj
+
 # Note that these tests are skipped if util.PATH_SEP is not os.path.sep.
 # This is because the functional tests should reflect the actual
 # operating environment.
@@ -159,7 +167,7 @@ def test_discover_complex_default(self):
         result[0]["tests"] = fix_test_order(result[0]["tests"])
 
         self.maxDiff = None
-        self.assertEqual(result, expected)
+        self.assertEqual(sorted_object(result), sorted_object(expected))
 
     def test_discover_complex_doctest(self):
         projroot, _ = resolve_testroot("complex")
@@ -243,7 +251,7 @@ def test_discover_complex_doctest(self):
         result[0]["tests"] = fix_test_order(result[0]["tests"])
 
         self.maxDiff = None
-        self.assertEqual(result, expected)
+        self.assertEqual(sorted_object(result), sorted_object(expected))
 
     def test_discover_not_found(self):
         projroot, testroot = resolve_testroot("notests")