Merge pull request #906 from murgatroid99/kokoro_log_merge_better_fix

Don't throw if failure is at index 0
This commit is contained in:
Michael Lumish 2019-06-05 10:09:09 -07:00 committed by GitHub
commit 1e03eae62f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -64,13 +64,16 @@ readDir(rootDir + '/reports')
))
)
.then((objects) => {
let merged = objects[0];
merged.testsuites.testsuite = Array.prototype.concat.apply([], objects.map((obj) => {
if (obj) {
return obj.testsuites.testsuite;
} else {
return parseFailureLog;
}}));
const merged = {
testsuites: {
testsuite: Array.prototype.concat.apply([], objects.map((obj) => {
if (obj) {
return obj.testsuites.testsuite;
} else {
return parseFailureLog;
}}))
}
}
let builder = new xml2js.Builder();
let xml = builder.buildObject(merged);
let resultName = path.resolve(rootDir, 'reports', dirName, 'sponge_log.xml');