More fixes for test UI

news/2 Fixes/16962.md

@@ -0,0 +1 @@
+Ensure 2.7 unittest still work with new test support.

news/2 Fixes/16963.md

@@ -0,0 +1 @@
+Fix issue with parsing test run ids for reporting test status.

src/client/testing/testController/common/testItemUtilities.ts

@@ -90,10 +90,10 @@ function getRangeFromRawSource(raw: { source: string }): Range | undefined {
 function getRunIdFromRawData(raw: { id: string }): string {
     // This is the id that will be used to compare with the results.
     const runId = raw.id
+        .replace(/\.py/g, '')
         .replace(/[\\\:\/]/g, '.')
         .replace(/\:\:/g, '.')
-        .replace(/\.\./g, '.')
-        .replace(/\.py/g, '');
+        .replace(/\.\./g, '.');
     return runId.startsWith('.') ? runId.substr(1) : runId;
 }
 

src/client/testing/testController/unittest/unittestController.ts

@@ -127,7 +127,8 @@ def generate_test_cases(suite):
         if isinstance(test, unittest.TestCase):
             yield test
         else:
-            yield from generate_test_cases(test)
+            for test_case in generate_test_cases(test):
+                yield test_case
 
 loader = unittest.TestLoader()
 suite = loader.discover("${startDir}", pattern="${pattern}")