Fix object sort order in tools tests (microsoft#14050)

karthiknadig · web-flow · commit e31046b212a7 · 2020-09-23T15:35:44.000-07:00
* Fix object sort order in tools tests

* rebase with main

* Fix formatting
diff --git a/pythonFiles/tests/testing_tools/adapter/test_functional.py b/pythonFiles/tests/testing_tools/adapter/test_functional.py
@@ -10,8 +10,6 @@
 import sys
 import unittest
 
-import pytest
-
 from ...__main__ import TESTING_TOOLS_ROOT
 from testing_tools.adapter.util import fix_path, PATH_SEP
 
@@ -83,6 +81,15 @@ 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.
@@ -141,7 +148,6 @@ def test_discover_simple(self):
             ],
         )
 
-    @pytest.mark.skip(reason="https://github.com/microsoft/vscode-python/issues/14023")
     def test_discover_complex_default(self):
         projroot, testroot = resolve_testroot("complex")
         expected = self.complex(projroot)
@@ -160,9 +166,8 @@ 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))
 
-    @pytest.mark.skip(reason="https://github.com/microsoft/vscode-python/issues/14023")
     def test_discover_complex_doctest(self):
         projroot, _ = resolve_testroot("complex")
         expected = self.complex(projroot)
@@ -245,7 +250,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")
