Skip to content

Commit 1e03eae

Browse files
authored
Merge pull request #906 from murgatroid99/kokoro_log_merge_better_fix
Don't throw if failure is at index 0
2 parents 55d6339 + a2d9ec3 commit 1e03eae

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

merge_kokoro_logs.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,16 @@ readDir(rootDir + '/reports')
6464
))
6565
)
6666
.then((objects) => {
67-
let merged = objects[0];
68-
merged.testsuites.testsuite = Array.prototype.concat.apply([], objects.map((obj) => {
69-
if (obj) {
70-
return obj.testsuites.testsuite;
71-
} else {
72-
return parseFailureLog;
73-
}}));
67+
const merged = {
68+
testsuites: {
69+
testsuite: Array.prototype.concat.apply([], objects.map((obj) => {
70+
if (obj) {
71+
return obj.testsuites.testsuite;
72+
} else {
73+
return parseFailureLog;
74+
}}))
75+
}
76+
}
7477
let builder = new xml2js.Builder();
7578
let xml = builder.buildObject(merged);
7679
let resultName = path.resolve(rootDir, 'reports', dirName, 'sponge_log.xml');

0 commit comments

Comments
 (0)