Use search folder as relative path to discover/execute test assemblies (#3718)

* Agent name should be unique within machine

* Patch test execution binaries

Author: Nitin Gurram

Tasks/VsTest/distributedtest.ts

@@ -53,9 +53,11 @@ export class DistributedTest {
         const envVars: { [key: string]: string; } = process.env;
         utils.Helper.addToProcessEnvVars(envVars, 'DTA.AccessToken', this.dtaTestConfig.dtaEnvironment.patToken);
         utils.Helper.addToProcessEnvVars(envVars, 'DTA.AgentId', agentId);
+        utils.Helper.addToProcessEnvVars(envVars, 'DTA.AgentName', this.dtaTestConfig.dtaEnvironment.agentName);
         utils.Helper.addToProcessEnvVars(envVars, 'DTA.EnvironmentUri', this.dtaTestConfig.dtaEnvironment.environmentUri);
         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);
 
         if(this.dtaTestConfig.vsTestLocationMethod === utils.Constants.vsTestVersionString) {
             utils.Helper.addToProcessEnvVars(envVars, 'DTA.TestPlatformVersion', this.dtaTestConfig.vsTestVersion);

Tasks/VsTest/make.json

@@ -6,7 +6,7 @@
                 "dest": "./"
             },
             {
-                "url": "https://testexecution.blob.core.windows.net/testexecution/3666244/TestExecution.zip",
+                "url": "https://testexecution.blob.core.windows.net/testexecution/3673529/TestExecution.zip",
                 "dest": "./Modules"
             }
         ]

Tasks/VsTest/models.ts

@@ -41,6 +41,7 @@ export interface DtaEnvironment {
     patToken: string;
     environmentUri: string;
     dtaHostLogFilePath: string;
+    agentName: string;
 }
 
 export interface VsTestConfigurations extends TestConfigurations {

Tasks/VsTest/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 18
+        "Patch": 19
     },
     "demands": [
         "vstest"

Tasks/VsTest/task.loc.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 18
+    "Patch": 19
   },
   "demands": [
     "vstest"

Tasks/VsTest/taskinputparser.ts

@@ -52,6 +52,7 @@ function initDtaEnvironment(): models.DtaEnvironment {
     const dtaEnvironment = {} as models.DtaEnvironment;
     dtaEnvironment.tfsCollectionUrl = tl.getVariable('System.TeamFoundationCollectionUri');
     dtaEnvironment.patToken = tl.getEndpointAuthorization('SystemVssConnection', true).parameters['AccessToken'];
+    dtaEnvironment.agentName = tl.getVariable('Agent.MachineName') + '-' + tl.getVariable('Agent.Name') + '-' + tl.getVariable('Agent.Id');
 
     //TODO : Consider build scenario
     const releaseId = tl.getVariable('Release.ReleaseId');

Tasks/VsTest/testagent.ts

@@ -10,12 +10,11 @@ export class TestAgent {
         while(currentRetryCount > 0) {
             currentRetryCount--;
             try {
-                const testAgentName: string = tl.getVariable('Agent.MachineName');
                 const envUrlRef: any = { Url: environment.environmentUri };
-                const machineNameRef = { Name: testAgentName };
+                const machineNameRef: any = { Name: environment.agentName };
                 // TODO : Change any to appropriate types once promiseme package is avialable
                 const testAgent: any = {
-                                    Name: testAgentName,
+                                    Name: environment.agentName,
                                     Capabilities: [],
                                     DtlEnvironment: envUrlRef,
                                     DtlMachine: machineNameRef };