Skip to content

Commit 6b4efd9

Browse files
Fix test task to fail on test failures (#17377)
* Fix test task to fail on test failures * remove unused done * Try fix result upload
1 parent b8b5886 commit 6b4efd9

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

build/build.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ steps:
2828
- bash: "gulp test:cover"
2929
displayName: "gulp test:cover"
3030

31+
- task: PublishTestResults@2
32+
inputs:
33+
testResultsFormat: 'JUnit'
34+
testResultsFiles: 'test-reports/test-results-ext.xml'
35+
condition: succeededOrFailed()
36+
3137
- bash: "gulp cover:combine-json"
3238
displayName: "gulp cover:combine-json"
3339

@@ -104,22 +110,6 @@ steps:
104110
inputs:
105111
targets: "ext:install-service"
106112

107-
- task: gulp@0
108-
displayName: "gulp cover:jenkins"
109-
inputs:
110-
targets: "cover:jenkins"
111-
publishJUnitResults: true
112-
testResultsFiles: "$(Build.SourcesDirectory)/test-reports/*.xml"
113-
enabled: false
114-
continueOnError: true
115-
116-
- task: PublishCodeCoverageResults@1
117-
displayName: "Publish code coverage from $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml"
118-
inputs:
119-
codeCoverageTool: Cobertura
120-
summaryFileLocation: "$(Build.SourcesDirectory)/coverage/cobertura-coverage.xml"
121-
enabled: false
122-
123113
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
124114
displayName: "Component Detection"
125115
inputs:

gulpfile.js

+8-16
Original file line numberDiff line numberDiff line change
@@ -237,30 +237,22 @@ gulp.task('ext:localization', gulp.series('ext:localization:generate-eng-package
237237

238238
gulp.task('ext:build', gulp.series('ext:localization', 'ext:copy', 'ext:clean-library-ts-files', 'ext:compile', 'ext:compile-view')); // removed lint before copy
239239

240-
gulp.task('ext:test', async (done) => {
240+
gulp.task('ext:test', async () => {
241241
let workspace = process.env['WORKSPACE'];
242242
if (!workspace) {
243243
workspace = process.cwd();
244244
}
245-
process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/ext_xunit.xml';
245+
process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/test-results-ext.xml';
246246
var args = ['--verbose', '--disable-gpu', '--disable-telemetry', '--disable-updates', '-n'];
247247
let vscodeVersion = packageJson.engines.vscode.slice(1);
248248
let extensionTestsPath = `${workspace}/out/test`;
249249
let vscodePath = await vscodeTest.downloadAndUnzipVSCode(vscodeVersion);
250-
try {
251-
await vscodeTest.runTests({
252-
vscodeExecutablePath: vscodePath,
253-
extensionDevelopmentPath: workspace,
254-
extensionTestsPath: extensionTestsPath,
255-
launchArgs: args
256-
});
257-
} catch (error) {
258-
console.log(`stdout: ${process.stdout}`);
259-
console.log(`stderr: ${process.stderr}`);
260-
console.error(`exec error: ${error}`);
261-
}
262-
done();
263-
process.exit(0);
250+
await vscodeTest.runTests({
251+
vscodeExecutablePath: vscodePath,
252+
extensionDevelopmentPath: workspace,
253+
extensionTestsPath: extensionTestsPath,
254+
launchArgs: args
255+
});
264256
});
265257

266258
gulp.task('test', gulp.series('ext:test'));

0 commit comments

Comments
 (0)