From 8d0b7e7f7e7593339963ce75f33ee59399b15618 Mon Sep 17 00:00:00 2001 From: Spencer Date: Tue, 31 Jul 2018 12:47:34 -0700 Subject: [PATCH] [junitReports] Rename reports so they are auto-discovered by CI (#21502) In order for the runbld project we use in CI to auto-discover the junit reports we generate they need to match `TEST-*.xml`, which will allow us to include more details in the failure emails, and push failure info to the build-stats cluster. --- src/dev/jest/junit_reporter.js | 2 +- src/dev/mocha/__tests__/junit_report_generation.js | 2 +- src/dev/mocha/junit_report_generation.js | 2 +- tasks/config/karma.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dev/jest/junit_reporter.js b/src/dev/jest/junit_reporter.js index a0ef73dbe088..17dc664a0d80 100644 --- a/src/dev/jest/junit_reporter.js +++ b/src/dev/jest/junit_reporter.js @@ -104,7 +104,7 @@ export default class JestJUnitReporter { }); }); - const reportPath = resolve(rootDirectory, `target/junit/${reportName}.xml`); + const reportPath = resolve(rootDirectory, `target/junit/TEST-${reportName}.xml`); const reportXML = root.end({ pretty: true, indent: ' ', diff --git a/src/dev/mocha/__tests__/junit_report_generation.js b/src/dev/mocha/__tests__/junit_report_generation.js index bceb4c9bcf83..5d1c56f31c59 100644 --- a/src/dev/mocha/__tests__/junit_report_generation.js +++ b/src/dev/mocha/__tests__/junit_report_generation.js @@ -49,7 +49,7 @@ describe('dev/mocha/junit report generation', () => { mocha.addFile(resolve(PROJECT_DIR, 'test.js')); await new Promise(resolve => mocha.run(resolve)); - const report = await fcb(cb => parseString(readFileSync(resolve(PROJECT_DIR, 'target/junit/test.xml')), cb)); + const report = await fcb(cb => parseString(readFileSync(resolve(PROJECT_DIR, 'target/junit/TEST-test.xml')), cb)); // test case results are wrapped in expect(report).to.eql({ diff --git a/src/dev/mocha/junit_report_generation.js b/src/dev/mocha/junit_report_generation.js index b7f2ba37392d..5572d4287a24 100644 --- a/src/dev/mocha/junit_report_generation.js +++ b/src/dev/mocha/junit_report_generation.js @@ -131,7 +131,7 @@ export function setupJUnitReportGeneration(runner, options = {}) { } }); - const reportPath = resolve(rootDirectory, `target/junit/${reportName}.xml`); + const reportPath = resolve(rootDirectory, `target/junit/TEST-${reportName}.xml`); const reportXML = builder.end({ pretty: true, indent: ' ', diff --git a/tasks/config/karma.js b/tasks/config/karma.js index d7d3057aa014..701c663592fb 100644 --- a/tasks/config/karma.js +++ b/tasks/config/karma.js @@ -56,7 +56,7 @@ module.exports = function (grunt) { reporters: process.env.CI ? ['dots', 'junit'] : ['progress'], junitReporter: { - outputFile: resolve(ROOT, 'target/junit/karma.xml'), + outputFile: resolve(ROOT, 'target/junit/TEST-karma.xml'), useBrowserName: false, nameFormatter: (browser, result) => [ ...result.suite,