Live stream the logs (#3874)

* Live stream the logs * Version bumpup * Fix web request logging * Downmerge from master * Identify line splits properly * Bump up task version * Updated task.json * Updated test execution engine
microsoft · Apr 24, 2017 · 3f0d634 · 3f0d634
1 parent a669bb2
commit 3f0d634
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 27 deletions.
diff --git a/Tasks/VsTest/distributedtest.ts b/Tasks/VsTest/distributedtest.ts
@@ -1,6 +1,5 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import * as Q from 'q';
 import * as ps from 'child_process';
 import * as tl from 'vsts-task-lib/task';
 import * as tr from 'vsts-task-lib/toolrunner';
@@ -20,7 +19,7 @@ export class DistributedTest {
         this.registerAndConfigureAgent();
     }
 
-   private async registerAndConfigureAgent() {
+    private async registerAndConfigureAgent() {
         tl.debug('Configure the Agent with DTA... Invoking the createAgent REST API');
 
         try {
@@ -35,7 +34,6 @@ export class DistributedTest {
             } catch (error) {
                 tl.warning('Modules/DTAExecutionHost.exe process kill failed, pid: ' + this.dtaPid + ' , error :' + error);
             }
-            tl.debug(fs.readFileSync(this.dtaTestConfig.dtaEnvironment.dtaHostLogFilePath, 'utf-8'));
             tl.setResult(tl.TaskResult.Succeeded, 'Task succeeded');
         } catch (error) {
             tl.error(error);
@@ -44,12 +42,6 @@ export class DistributedTest {
     }
 
     private async startDtaExecutionHost(agentId: any) {
-        try {
-            tl.rmRF(this.dtaTestConfig.dtaEnvironment.dtaHostLogFilePath, true);
-        } catch (error) {
-            //Ignore.
-        }
-
         const envVars: { [key: string]: string; } = process.env;
         utils.Helper.addToProcessEnvVars(envVars, 'DTA.AccessToken', this.dtaTestConfig.dtaEnvironment.patToken);
         utils.Helper.addToProcessEnvVars(envVars, 'DTA.AgentId', agentId);
@@ -58,14 +50,15 @@ export class DistributedTest {
         utils.Helper.addToProcessEnvVars(envVars, 'DTA.TeamFoundationCollectionUri', this.dtaTestConfig.dtaEnvironment.tfsCollectionUrl);
         utils.Helper.addToProcessEnvVars(envVars, 'DTA.MiniMatchSourceFilter', 'true');
         utils.Helper.addToProcessEnvVars(envVars, 'DTA.LocalTestDropPath', this.dtaTestConfig.testDropLocation);
+        utils.Helper.addToProcessEnvVars(envVars, 'DTA.EnableConsoleLogs', 'true');
 
         if (this.dtaTestConfig.vsTestLocationMethod === utils.Constants.vsTestVersionString) {
             utils.Helper.addToProcessEnvVars(envVars, 'DTA.TestPlatformVersion', this.dtaTestConfig.vsTestVersion);
         }
 
         const exeInfo = await versionFinder.locateVSTestConsole(this.dtaTestConfig);
         if (exeInfo) {
-            const exelocation = path.dirname(exeInfo)
+            const exelocation = path.dirname(exeInfo);
             tl.debug('Adding env var DTA.TestWindow.Path = ' + exelocation);
 
             // Split the TestWindow path out of full path - if we can't find it, will assume
@@ -87,14 +80,35 @@ export class DistributedTest {
         // So we are not redirecting the IO streams from the DTAExecutionHost.exe process
         // We are not using toolrunner here because it doesn't have option to ignore the IO stream, so directly using spawn
 
-        const proc = ps.spawn(path.join(__dirname, 'Modules/DTAExecutionHost.exe'), [], { env: envVars, stdio: 'ignore' });
+        const proc = ps.spawn(path.join(__dirname, 'Modules/DTAExecutionHost.exe'), [], { env: envVars });
         this.dtaPid = proc.pid;
         tl.debug('Modules/DTAExecutionHost.exe is executing with the process id : ' + this.dtaPid);
 
-        proc.on('error', (err) => {
-                this.dtaPid = -1;
-                throw new Error('Failed to start Modules/DTAExecutionHost.exe.');
+        proc.stdout.setEncoding('utf8');
+        proc.stderr.setEncoding('utf8');
+        proc.stdout.on('data', (c) => {
+            // this is bit hacky way to fix the web method logging as it's not configurable currently
+            // and writes info to stdout directly
+            const lines = c.toString().split('\n');
+            lines.forEach(function (line: string) {
+                if (line.startsWith('Web method')) {
+                    tl.debug(line);
+                } else {
+                    tl._writeLine(line.toString());
+                }
             });
+        });
+        proc.stderr.on('data', (c) => {
+            const lines = c.toString().split('\n');
+            lines.forEach(function (line: string) {
+               tl._writeError(line.toString());
+            });
+        });
+
+        proc.on('error', (err) => {
+            this.dtaPid = -1;
+            throw new Error('Failed to start Modules/DTAExecutionHost.exe.');
+        });
 
         proc.on('close', (code) => {
             if (code !== 0) {
@@ -122,7 +136,9 @@ export class DistributedTest {
         //Modify settings file to enable configurations and data collectors.
         let settingsFile = this.dtaTestConfig.settingsFile;
         try {
-            settingsFile = await settingsHelper.updateSettingsFileAsRequired(this.dtaTestConfig.settingsFile, this.dtaTestConfig.runInParallel, this.dtaTestConfig.tiaConfig, null, false, this.dtaTestConfig.overrideTestrunParameters);
+            settingsFile = await settingsHelper.updateSettingsFileAsRequired
+                (this.dtaTestConfig.settingsFile, this.dtaTestConfig.runInParallel, this.dtaTestConfig.tiaConfig,
+                null, false, this.dtaTestConfig.overrideTestrunParameters);
             //Reset override option so that it becomes a no-op in TaskExecutionHost
             this.dtaTestConfig.overrideTestrunParameters = null;
         } catch (error) {
@@ -134,17 +150,17 @@ export class DistributedTest {
         utils.Helper.addToProcessEnvVars(envVars, 'runsettings', settingsFile);
         utils.Helper.addToProcessEnvVars(envVars, 'testdroplocation', this.dtaTestConfig.testDropLocation);
         utils.Helper.addToProcessEnvVars(envVars, 'testrunparams', this.dtaTestConfig.overrideTestrunParameters);
-        utils.Helper.setEnvironmentVariableToString(envVars, 'codecoverageenabled', this.dtaTestConfig.codeCoverageEnabled);
         utils.Helper.addToProcessEnvVars(envVars, 'buildconfig', this.dtaTestConfig.buildConfig);
         utils.Helper.addToProcessEnvVars(envVars, 'buildplatform', this.dtaTestConfig.buildPlatform);
         utils.Helper.addToProcessEnvVars(envVars, 'testconfigurationmapping', this.dtaTestConfig.testConfigurationMapping);
         utils.Helper.addToProcessEnvVars(envVars, 'testruntitle', this.dtaTestConfig.testRunTitle);
         utils.Helper.addToProcessEnvVars(envVars, 'testselection', this.dtaTestConfig.testSelection);
         utils.Helper.addToProcessEnvVars(envVars, 'tcmtestrun', this.dtaTestConfig.onDemandTestRunId);
-        utils.Helper.setEnvironmentVariableToString(envVars, 'testplan', this.dtaTestConfig.testplan);
         if (!utils.Helper.isNullOrUndefined(this.dtaTestConfig.testSuites)) {
             utils.Helper.addToProcessEnvVars(envVars, 'testsuites', this.dtaTestConfig.testSuites.join(','));
         }
+        utils.Helper.setEnvironmentVariableToString(envVars, 'codecoverageenabled', this.dtaTestConfig.codeCoverageEnabled);
+        utils.Helper.setEnvironmentVariableToString(envVars, 'testplan', this.dtaTestConfig.testplan);
         utils.Helper.setEnvironmentVariableToString(envVars, 'testplanconfigid', this.dtaTestConfig.testPlanConfigId);
         // In the phases world we will distribute based on number of agents
         utils.Helper.setEnvironmentVariableToString(envVars, 'customslicingenabled', 'true');
@@ -156,15 +172,15 @@ export class DistributedTest {
     }
 
     private async cleanUp(temporarySettingsFile: string) {
-    //cleanup the runsettings file
-    if (temporarySettingsFile && this.dtaTestConfig.settingsFile !== temporarySettingsFile) {
-        try {
-            tl.rmRF(temporarySettingsFile, true);
-        } catch (error) {
-            //Ignore.
+        //cleanup the runsettings file
+        if (temporarySettingsFile && this.dtaTestConfig.settingsFile !== temporarySettingsFile) {
+            try {
+                tl.rmRF(temporarySettingsFile, true);
+            } catch (error) {
+                //Ignore.
+            }
         }
     }
-    }
     private dtaTestConfig: models.DtaTestConfigurations;
     private dtaPid: number;
 }
diff --git a/Tasks/VsTest/make.json b/Tasks/VsTest/make.json
@@ -6,7 +6,7 @@
                 "dest": "./"
             },
             {
-                "url": "https://testexecution.blob.core.windows.net/testexecution/3766237/TestExecution.zip",
+                "url": "https://testexecution.blob.core.windows.net/testexecution/3812251/TestExecution.zip",
                 "dest": "./Modules"
             }
         ]

diff --git a/Tasks/VsTest/task.json b/Tasks/VsTest/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 32
+        "Patch": 33
     },
     "demands": [
         "vstest"

diff --git a/Tasks/VsTest/task.loc.json b/Tasks/VsTest/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 32
+    "Patch": 33
   },
   "demands": [
     "vstest"