resolved merge conflicts (#11919)

Author: ShreyasRmsft

Tasks/VsTestV2/distributedtest.ts

@@ -36,15 +36,12 @@ export class DistributedTest {
             }
         } catch (error) {
             ci.publishEvent({ environmenturi: this.inputDataContract.RunIdentifier, error: error });
-            tl.error(error);
             tl.setResult(tl.TaskResult.Failed, error, true);
         }
     }
 
     private async startDtaExecutionHost(): Promise<number> {
-
-        // let envVars: { [key: string]: string; } = <{ [key: string]: string; }>{};
-        let envVars: { [key: string]: string; } = process.env; // This is a temporary solution where we are passing parent process env vars, we should get away from this
+        let envVars: { [key: string]: string; } = process.env;
 
         // Overriding temp with agent temp
         utils.Helper.addToProcessEnvVars(envVars, 'temp', utils.Helper.GetTempFolder());
@@ -75,7 +72,7 @@ export class DistributedTest {
 
         const dtaExecutionHostTool = tl.tool(path.join(__dirname, 'Modules/DTAExecutionHost.exe'));
         dtaExecutionHostTool.arg(['--inputFile', inputFilePath]);
-        const code = await dtaExecutionHostTool.exec(<tr.IExecOptions>{ ignoreReturnCode:this.inputDataContract.TestReportingSettings.ExecutionStatusSettings.IgnoreTestFailures, env: envVars });
+        const code = await dtaExecutionHostTool.exec(<tr.IExecOptions>{ ignoreReturnCode: this.inputDataContract.TestReportingSettings.ExecutionStatusSettings.IgnoreTestFailures, env: envVars });
 
         //hydra: add consolidated ci for inputs in C# layer for now
         const consolidatedCiData = {
@@ -101,13 +98,13 @@ export class DistributedTest {
             }
             const telemetryProps: { [key: string]: any; } = { MiniMatchLines: sourceFilter.length };
             telemetryProps.ExecutionFlow = 'Distributed';
-            var start = new Date().getTime();
+            const start = new Date().getTime();
             const sources = tl.findMatch(this.inputDataContract.TestSelectionSettings.SearchFolder, sourceFilter);
             tl.debug(`${sources.length} files matched the given minimatch filter`);
-            var timeTaken = new Date().getTime() - start;
-            tl.debug(`Time taken for applying the minimatch pattern to filter out the sources ${timeTaken} ms` );
+            const timeTaken = new Date().getTime() - start;
+            tl.debug(`Time taken for applying the minimatch pattern to filter out the sources ${timeTaken} ms`);
             telemetryProps.TimeToSearchDLLsInMilliSeconds = timeTaken;
-            ci.publishTelemetry('TestExecution','MinimatchFilterPerformance', telemetryProps);
+            ci.publishTelemetry('TestExecution', 'MinimatchFilterPerformance', telemetryProps);
             const filesMatching = [];
             sources.forEach(function (match: string) {
                 if (!fs.lstatSync(match).isDirectory()) {
@@ -118,8 +115,11 @@ export class DistributedTest {
             tl.debug('Files matching count :' + filesMatching.length);
             if (filesMatching.length === 0) {
                 tl.warning(tl.loc('noTestSourcesFound', sourceFilter.toString()));
-                if (this.inputDataContract.TestReportingSettings.ExecutionStatusSettings.ActionOnThresholdNotMet.toLowerCase() == "fail") {
+                if (this.inputDataContract.TestReportingSettings.ExecutionStatusSettings.ActionOnThresholdNotMet.toLowerCase() === 'fail') {
                     throw new Error(tl.loc('minTestsNotExecuted', this.inputDataContract.TestReportingSettings.ExecutionStatusSettings.MinimumExecutedTestsExpected));
+                } else {
+                    tl.setResult(tl.TaskResult.Succeeded, tl.loc('noTestSourcesFound', sourceFilter.toString()), true);
+                    process.exit(0);
                 }
             }
 

Tasks/VsTestV2/inputdatacontract.ts

@@ -96,7 +96,7 @@ export interface ExecutionSettings {
     DefaultTestBatchSize : number;
     AssemblyLevelParallelism : boolean;
     CodeCoverageEnabled : boolean;
-    PathToCustomTestAdapters : string;   
+    PathToCustomTestAdapters : string;
     ProceedAfterAbortedTestCase : boolean;
     PathToCustomVsTestConsoleWrapperAssembly : string;
     SettingsFile : string;

Tasks/VsTestV2/nondistributedtest.ts

@@ -21,7 +21,6 @@ export class NonDistributedTest {
 
     private async invokeDtaExecutionHost() {
         try {
-
             console.log(tl.loc('runTestsLocally', 'vstest.console.exe'));
             console.log('========================================================');
             const exitCode = await this.startDtaExecutionHost();
@@ -40,7 +39,6 @@ export class NonDistributedTest {
             }
 
         } catch (err) {
-            tl.error(err);
             tl.setResult(tl.TaskResult.Failed, tl.loc('VstestFailedReturnCode'), true);
         }
     }
@@ -103,10 +101,10 @@ export class NonDistributedTest {
             console.log(tl.loc('UserProvidedSourceFilter', this.sourceFilter.toString()));
             const telemetryProps: { [key: string]: any; } = { MiniMatchLines: this.sourceFilter.length };
             telemetryProps.ExecutionFlow = 'NonDistributed';
-            var start = new Date().getTime();
+            const start = new Date().getTime();
             const sources = tl.findMatch(this.inputDataContract.TestSelectionSettings.SearchFolder, this.sourceFilter);
-            var timeTaken = new Date().getTime() - start;
-            tl.debug( `Time taken for applying the minimatch pattern to filter out the sources ${timeTaken} ms` );
+            const timeTaken = new Date().getTime() - start;
+            tl.debug(`Time taken for applying the minimatch pattern to filter out the sources ${timeTaken} ms`);
             telemetryProps.TimeToSearchDLLsInMilliSeconds = timeTaken;
             tl.debug(`${sources.length} files matched the given minimatch filter`);
             ci.publishTelemetry('TestExecution','MinimatchFilterPerformance', telemetryProps);
@@ -120,8 +118,11 @@ export class NonDistributedTest {
             tl.debug('Files matching count :' + filesMatching.length);
             if (filesMatching.length === 0) {
                 tl.warning(tl.loc('noTestSourcesFound', this.sourceFilter.toString()));
-                if (this.inputDataContract.TestReportingSettings.ExecutionStatusSettings.ActionOnThresholdNotMet.toLowerCase() == "fail") {
+                if (this.inputDataContract.TestReportingSettings.ExecutionStatusSettings.ActionOnThresholdNotMet.toLowerCase() === 'fail') {
                     throw new Error(tl.loc('minTestsNotExecuted', this.inputDataContract.TestReportingSettings.ExecutionStatusSettings.MinimumExecutedTestsExpected));
+                } else {
+                    tl.setResult(tl.TaskResult.Succeeded, tl.loc('noTestSourcesFound', this.sourceFilter.toString()), true);
+                    process.exit(0);
                 }
             }
 
@@ -135,6 +136,5 @@ export class NonDistributedTest {
     }
 
     private inputDataContract: InputDataContract;
-    private testAssemblyFiles: string[];
     private sourceFilter: string[] = tl.getDelimitedInput('testAssemblyVer2', '\n', true);
 }