Changes for executing Python Tests

Tasks/AzureTestPlanV0/Invokers/pythoninvoker.ts

@@ -4,7 +4,7 @@ import constants = require('../constants');
 
 export async function executePythonTests(testsToBeExecuted: string[]):Promise<number> {
     // Perform test discovery
-    const discoveryArgs: string[] = ['--collect-only'];
+    const discoveryArgs: string[] = ['--collect-only', '-q'];
     const discoveryResult = await runPytestCommand(discoveryArgs);
 
     if (discoveryResult.status !== 0) {
@@ -14,10 +14,18 @@ export async function executePythonTests(testsToBeExecuted: string[]):Promise<nu
 
     // Extract discovered tests from stdout
     const discoveredTests: string[] = extractDiscoveredTests(discoveryResult.stdout ?? '');
+    testsToBeExecuted = testsToBeExecuted.map(transformTestStrings);
 
     // Find common tests between testsToBeExecuted and discovered tests
     const testsToRun: string[] = testsToBeExecuted.filter(test => discoveredTests.indexOf(test) !== -1);
 
+    // Variables for debug console logs
+    const testsToBeExecutedString: string = testsToBeExecuted.join(", ");
+    const testsToRunString: string = testsToRun.join(", ");
+
+    tl.debug(`Tests to executed are: ${testsToBeExecutedString}`);
+    tl.debug(`Tests to run are: ${testsToRunString}`);
+
     if (testsToRun.length === 0) {
         tl.warning("No common tests found between specified tests and discovered tests.");
         return 0;
@@ -57,7 +65,7 @@ async function runPytestCommand(args: string[]): Promise<SpawnResult> {
     }
 }
 
-function extractDiscoveredTests(output) {
+function extractOldDiscoveredTests(output) {
     const testNames = [];
     let currentPackage = '';
     let currentModule = '';
@@ -87,3 +95,33 @@ function extractDiscoveredTests(output) {
     tl.debug("Discovered tests : " + testNames);
     return testNames;
 }
+
+function extractDiscoveredTests(output: string) {
+    const testNames = [];
+
+    const lines = output.split('\n');
+
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i].trim();
+        if(line && line.includes(".py")){
+            testNames.push(line);
+        }
+    }
+    tl.debug("Discovered tests : " + testNames);
+    return testNames;
+}
+
+function transformTestStrings(test: string): string {
+        // Remove any leading or trailing whitespace
+        test = test.trim();
+
+        // Replace '.' with '/' for the directory structure
+        // Replace the last part of the string with '.py'
+        test = test.replace(/\./g, '/').replace(/\.([^/]+)$/, '.py');
+
+        // Add the `::` before the test function name
+        const parts = test.split('/');
+        const functionName = parts.pop(); // Remove the function name
+        const testFile = parts.join('/'); // Join back the file path
+        return `${testFile}.py::${functionName}`; // Format as required
+}

Tasks/AzureTestPlanV0/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 2
+    "Patch": 4
   },
   "preview": true,
   "demands": [],

Tasks/AzureTestPlanV0/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 2
+    "Patch": 4
   },
   "preview": true,
   "demands": [],

_generated/AzureTestPlanV0.versionmap.txt

@@ -1,2 +1,2 @@
-Default|0.250.2
-Node20-225|0.250.3
+Default|0.250.4
+Node20-225|0.250.5

_generated/AzureTestPlanV0/Invokers/pythoninvoker.ts

@@ -4,7 +4,7 @@ import constants = require('../constants');
 
 export async function executePythonTests(testsToBeExecuted: string[]):Promise<number> {
     // Perform test discovery
-    const discoveryArgs: string[] = ['--collect-only'];
+    const discoveryArgs: string[] = ['--collect-only', '-q'];
     const discoveryResult = await runPytestCommand(discoveryArgs);
 
     if (discoveryResult.status !== 0) {
@@ -14,10 +14,18 @@ export async function executePythonTests(testsToBeExecuted: string[]):Promise<nu
 
     // Extract discovered tests from stdout
     const discoveredTests: string[] = extractDiscoveredTests(discoveryResult.stdout ?? '');
+    testsToBeExecuted = testsToBeExecuted.map(transformTestStrings);
 
     // Find common tests between testsToBeExecuted and discovered tests
     const testsToRun: string[] = testsToBeExecuted.filter(test => discoveredTests.indexOf(test) !== -1);
 
+    // Variables for debug console logs
+    const testsToBeExecutedString: string = testsToBeExecuted.join(", ");
+    const testsToRunString: string = testsToRun.join(", ");
+
+    tl.debug(`Tests to executed are: ${testsToBeExecutedString}`);
+    tl.debug(`Tests to run are: ${testsToRunString}`);
+
     if (testsToRun.length === 0) {
         tl.warning("No common tests found between specified tests and discovered tests.");
         return 0;
@@ -57,7 +65,7 @@ async function runPytestCommand(args: string[]): Promise<SpawnResult> {
     }
 }
 
-function extractDiscoveredTests(output) {
+function extractOldDiscoveredTests(output) {
     const testNames = [];
     let currentPackage = '';
     let currentModule = '';
@@ -87,3 +95,33 @@ function extractDiscoveredTests(output) {
     tl.debug("Discovered tests : " + testNames);
     return testNames;
 }
+
+function extractDiscoveredTests(output: string) {
+    const testNames = [];
+
+    const lines = output.split('\n');
+
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i].trim();
+        if(line && line.includes(".py")){
+            testNames.push(line);
+        }
+    }
+    tl.debug("Discovered tests : " + testNames);
+    return testNames;
+}
+
+function transformTestStrings(test: string): string {
+        // Remove any leading or trailing whitespace
+        test = test.trim();
+
+        // Replace '.' with '/' for the directory structure
+        // Replace the last part of the string with '.py'
+        test = test.replace(/\./g, '/').replace(/\.([^/]+)$/, '.py');
+
+        // Add the `::` before the test function name
+        const parts = test.split('/');
+        const functionName = parts.pop(); // Remove the function name
+        const testFile = parts.join('/'); // Join back the file path
+        return `${testFile}.py::${functionName}`; // Format as required
+}

_generated/AzureTestPlanV0/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 2
+    "Patch": 4
   },
   "preview": true,
   "demands": [],
@@ -186,8 +186,8 @@
     "MultipleMatchingGradlewFound": "Multiple gradlew files found. Selecting the first matched instance"
   },
   "_buildConfigMapping": {
-    "Default": "0.250.2",
+    "Default": "0.250.4",
     "LocalPackages": "0.249.4",
-    "Node20-225": "0.250.3"
+    "Node20-225": "0.250.5"
   }
 }

_generated/AzureTestPlanV0/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 2
+    "Patch": 4
   },
   "preview": true,
   "demands": [],
@@ -186,8 +186,8 @@
     "MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound"
   },
   "_buildConfigMapping": {
-    "Default": "0.250.2",
+    "Default": "0.250.4",
     "LocalPackages": "0.249.4",
-    "Node20-225": "0.250.3"
+    "Node20-225": "0.250.5"
   }
 }

_generated/AzureTestPlanV0_Node20/Invokers/pythoninvoker.ts

@@ -4,7 +4,7 @@ import constants = require('../constants');
 
 export async function executePythonTests(testsToBeExecuted: string[]):Promise<number> {
     // Perform test discovery
-    const discoveryArgs: string[] = ['--collect-only'];
+    const discoveryArgs: string[] = ['--collect-only', '-q'];
     const discoveryResult = await runPytestCommand(discoveryArgs);
 
     if (discoveryResult.status !== 0) {
@@ -14,10 +14,18 @@ export async function executePythonTests(testsToBeExecuted: string[]):Promise<nu
 
     // Extract discovered tests from stdout
     const discoveredTests: string[] = extractDiscoveredTests(discoveryResult.stdout ?? '');
+    testsToBeExecuted = testsToBeExecuted.map(transformTestStrings);
 
     // Find common tests between testsToBeExecuted and discovered tests
     const testsToRun: string[] = testsToBeExecuted.filter(test => discoveredTests.indexOf(test) !== -1);
 
+    // Variables for debug console logs
+    const testsToBeExecutedString: string = testsToBeExecuted.join(", ");
+    const testsToRunString: string = testsToRun.join(", ");
+
+    tl.debug(`Tests to executed are: ${testsToBeExecutedString}`);
+    tl.debug(`Tests to run are: ${testsToRunString}`);
+
     if (testsToRun.length === 0) {
         tl.warning("No common tests found between specified tests and discovered tests.");
         return 0;
@@ -57,7 +65,7 @@ async function runPytestCommand(args: string[]): Promise<SpawnResult> {
     }
 }
 
-function extractDiscoveredTests(output) {
+function extractOldDiscoveredTests(output) {
     const testNames = [];
     let currentPackage = '';
     let currentModule = '';
@@ -87,3 +95,33 @@ function extractDiscoveredTests(output) {
     tl.debug("Discovered tests : " + testNames);
     return testNames;
 }
+
+function extractDiscoveredTests(output: string) {
+    const testNames = [];
+
+    const lines = output.split('\n');
+
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i].trim();
+        if(line && line.includes(".py")){
+            testNames.push(line);
+        }
+    }
+    tl.debug("Discovered tests : " + testNames);
+    return testNames;
+}
+
+function transformTestStrings(test: string): string {
+        // Remove any leading or trailing whitespace
+        test = test.trim();
+
+        // Replace '.' with '/' for the directory structure
+        // Replace the last part of the string with '.py'
+        test = test.replace(/\./g, '/').replace(/\.([^/]+)$/, '.py');
+
+        // Add the `::` before the test function name
+        const parts = test.split('/');
+        const functionName = parts.pop(); // Remove the function name
+        const testFile = parts.join('/'); // Join back the file path
+        return `${testFile}.py::${functionName}`; // Format as required
+}

_generated/AzureTestPlanV0_Node20/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 3
+    "Patch": 5
   },
   "preview": true,
   "demands": [],
@@ -190,8 +190,8 @@
     "MultipleMatchingGradlewFound": "Multiple gradlew files found. Selecting the first matched instance"
   },
   "_buildConfigMapping": {
-    "Default": "0.250.2",
+    "Default": "0.250.4",
     "LocalPackages": "0.249.4",
-    "Node20-225": "0.250.3"
+    "Node20-225": "0.250.5"
   }
 }

_generated/AzureTestPlanV0_Node20/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 3
+    "Patch": 5
   },
   "preview": true,
   "demands": [],
@@ -190,8 +190,8 @@
     "MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound"
   },
   "_buildConfigMapping": {
-    "Default": "0.250.2",
+    "Default": "0.250.4",
     "LocalPackages": "0.249.4",
-    "Node20-225": "0.250.3"
+    "Node20-225": "0.250.5"
   }
 }