Skip to content

Commit aef4de5

Browse files
authored
Fixed task hang issue for vstest task (#9309)
1 parent e9daa9f commit aef4de5

File tree

8 files changed

+90
-84
lines changed

8 files changed

+90
-84
lines changed

Tasks/VsTestV2/cieventlogger.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@ function getDefaultProps() {
1515
export function publishEvent(properties: { [key: string]: any }): void {
1616
try {
1717
tl.assertAgent('2.125.0');
18-
tl.publishTelemetry(area, feature, Object.assign(getDefaultProps(), properties));
18+
publishTelemetry(area, feature, Object.assign(getDefaultProps(), properties));
1919

2020
} catch (err) {
2121
tl.debug('Unable to publish telemetry due to lower agent version.');
2222
}
23+
}
24+
25+
export function publishTelemetry(area: string, feature: string, properties: { [key: string]: any }): void {
26+
const data = JSON.stringify(properties);
27+
tl.debug('telemetry area: ' + area + ' feature: ' + feature + ' data: ' + data);
28+
tl.command('telemetry.publish', { 'area': area, 'feature': feature }, data);
2329
}

Tasks/VsTestV2/distributedtest.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ export class DistributedTest {
2929

3030
if (exitCode !== 0) {
3131
tl.debug('Modules/DTAExecutionHost.exe process exited with code ' + exitCode);
32-
tl.setResult(tl.TaskResult.Failed, 'Modules/DTAExecutionHost.exe process exited with code ' + exitCode);
32+
tl.setResult(tl.TaskResult.Failed, 'Modules/DTAExecutionHost.exe process exited with code ' + exitCode, true);
3333
} else {
3434
tl.debug('Modules/DTAExecutionHost.exe exited');
35-
tl.setResult(tl.TaskResult.Succeeded, 'Task succeeded');
35+
tl.setResult(tl.TaskResult.Succeeded, 'Task succeeded', true);
3636
}
3737
} catch (error) {
3838
ci.publishEvent({ environmenturi: this.inputDataContract.RunIdentifier, error: error });
3939
tl.error(error);
40-
tl.setResult(tl.TaskResult.Failed, error);
40+
tl.setResult(tl.TaskResult.Failed, error, true);
4141
}
4242
}
4343

Tasks/VsTestV2/nondistributedtest.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ export class NonDistributedTest {
3636

3737
if (exitCode !== 0 && !this.inputDataContract.ExecutionSettings.IgnoreTestFailures) {
3838
tl.debug('Modules/DTAExecutionHost.exe process exited with code ' + exitCode);
39-
tl.setResult(tl.TaskResult.Failed, tl.loc('VstestFailed'));
39+
tl.setResult(tl.TaskResult.Failed, tl.loc('VstestFailed'), true);
4040
return;
4141
} else {
4242
if (exitCode !== 0) {
4343
console.log('Task marked as success because IgnoreTestFailures is enabled');
4444
}
4545
tl.debug(`Modules/DTAExecutionHost.exe exited with code ${exitCode}`);
46-
tl.setResult(tl.TaskResult.Succeeded, 'Task succeeded');
46+
tl.setResult(tl.TaskResult.Succeeded, 'Task succeeded', true);
4747
}
4848

4949
} catch (err) {
5050
tl.error(err);
51-
tl.setResult(tl.TaskResult.Failed, tl.loc('VstestFailedReturnCode'));
51+
tl.setResult(tl.TaskResult.Failed, tl.loc('VstestFailedReturnCode'), true);
5252
}
5353
}
5454

Tasks/VsTestV2/package-lock.json

Lines changed: 70 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/VsTestV2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"string": "3.3.1",
2020
"uuid": "3.1.0",
2121
"vso-node-api": "6.0.4-preview",
22-
"vsts-task-lib": "2.0.6",
22+
"vsts-task-lib": "2.7.0",
2323
"xml2js": "0.4.16",
2424
"@types/node": "^6.0.101",
2525
"@types/q": "^1.5.0"

Tasks/VsTestV2/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 2,
1919
"Minor": 144,
20-
"Patch": 11
20+
"Patch": 12
2121
},
2222
"demands": [
2323
"vstest"

Tasks/VsTestV2/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 2,
1919
"Minor": 144,
20-
"Patch": 11
20+
"Patch": 12
2121
},
2222
"demands": [
2323
"vstest"

0 commit comments

Comments
 (0)