Cherry pick fixes from main (microsoft#17348)

* Fix for filenames starting with py. (microsoft#17275)

* Fix for filenames starting with py.

* Add news item.

* Update change logs for cherry pick

Author: karthiknadig

CHANGELOG.md

@@ -26,6 +26,8 @@
    ([#17309](https://github.com/Microsoft/vscode-python/issues/17309))
 1. For CI ensure `tensorboard` is installed in python 3 environments only.
    ([#17325](https://github.com/Microsoft/vscode-python/issues/17325))
+1. Fix for test result not found for files starting with py.
+   ([#17270](https://github.com/Microsoft/vscode-python/issues/17270))
 
 ### Thanks
 

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

@@ -97,7 +97,7 @@ export async function updateResultFromJunitXml(
             }
 
             const result = junitSuite.testcase.find((t) => {
-                const idResult = getRunIdFromRawData(`${t.$.classname}.${t.$.name}`);
+                const idResult = getRunIdFromRawData(`${t.$.classname}::${t.$.name}`);
                 const idNode = rawTestCaseNode.runId;
                 return idResult === idNode || idNode.endsWith(idResult);
             });

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

@@ -88,9 +88,12 @@ function getRangeFromRawSource(raw: { source: string }): Range | undefined {
 }
 
 export function getRunIdFromRawData(id: string): string {
+    // TODO: This is a temporary solution to normalize test ids.
+    // The current method is error prone and easy to break. When we
+    // re-write the test adapters we should make sure we consider this.
     // This is the id that will be used to compare with the results.
     const runId = id
-        .replace(/\.py/g, '')
+        .replace(/\.py[^\w\-]/g, '') // we want to get rid of the `.py` in file names
         .replace(/[\\\:\/]/g, '.')
         .replace(/\:\:/g, '.')
         .replace(/\.\./g, '.');