From a42cd776a51b1c6b259b5d0a46ab93c00e95f9a6 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Sun, 15 Dec 2013 14:40:45 -0700 Subject: [PATCH] more modifications in the name of cleaner Jenkins results --- test/integration/yaml_suite/index.js | 2 +- test/utils/make_j_unit_xml.js | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/integration/yaml_suite/index.js b/test/integration/yaml_suite/index.js index d2e643b8f..792469a8d 100644 --- a/test/integration/yaml_suite/index.js +++ b/test/integration/yaml_suite/index.js @@ -11,7 +11,7 @@ var argv = require('./argv'); var testDir = path.resolve(__dirname, './tests'); var doPattern = new Minimatch(argv.match); -describe('yaml -', function () { +describe('integration', function () { this.timeout(30000); // before running any tests... diff --git a/test/utils/make_j_unit_xml.js b/test/utils/make_j_unit_xml.js index 29ec34305..2aaa8ad14 100644 --- a/test/utils/make_j_unit_xml.js +++ b/test/utils/make_j_unit_xml.js @@ -48,6 +48,7 @@ function makeJUnitXml(runnerName, testDetails) { _.each(suiteInfo.results, function (testInfo) { var section; + var integration = false; if (suiteInfo.name.match(/\/.*\.yaml$/)) { section = suiteInfo.name.split('/').slice(0, -1).join('/').replace(/\./g, '/'); @@ -55,10 +56,15 @@ function makeJUnitXml(runnerName, testDetails) { section = suiteInfo.name.replace(/\./g, ','); } + if (section.indexOf('integration ') === 0) { + section = section.replace(/^integration /, ''); + integration = true; + } + var testcase = suite.ele('testcase', { name: testInfo.name, time: (testInfo.time || 0) / 1000, - classname: runnerName + '.' + section + classname: runnerName + (integration ? ' - integration' : '') + '.' + section }); if (testInfo.errMsg) {