send logger http output from child process (#3462)

gravityvi · web-flow · commit 2cd3314ecd9f · 2022-11-02T16:18:10.000+01:00
diff --git a/lib/reporter/global-reporter.js b/lib/reporter/global-reporter.js
@@ -55,9 +55,9 @@ module.exports = class GlobalReporter {
     });
   }
 
-  addTestSuiteResults(testResults) {
+  addTestSuiteResults(testResults, httpOutput) {
     testResults = testResults || {};
-    testResults.httpOutput = Logger.collectOutput().map(item => {
+    testResults.httpOutput = (httpOutput || Logger.collectOutput()).map(item => {
       return [item[0], this.ansiConverter.toHtml(item[1]),
         (item[2] ? this.ansiConverter.toHtml(item[2]) : '')];
     });
@@ -71,7 +71,7 @@ module.exports = class GlobalReporter {
     if (!Concurrency.isTestWorker()) {
       emitter.on('message', data => {
         data = JSON.parse(data);
-        this.addTestSuiteResults(data.results);
+        this.addTestSuiteResults(data.results, data.httpOutput);
       });
     }
   }
diff --git a/lib/testsuite/index.js b/lib/testsuite/index.js
@@ -598,7 +598,8 @@ class TestSuite {
       process.send(SafeJSON.stringify({
         type: 'testsuite_finished',
         itemKey: process.env.__NIGHTWATCH_ENV_LABEL,
-        results: this.reporter.exportResults()
+        results: this.reporter.exportResults(),
+        httpOutput: Logger.collectOutput()
       }));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ module.exports = class GlobalReporter {`
`55`	`55`	`});`
`56`	`56`	`}`
`57`	`57`
`58`		`- addTestSuiteResults(testResults) {`
	`58`	`+ addTestSuiteResults(testResults, httpOutput) {`
`59`	`59`	`testResults = testResults \|\| {};`
`60`		`- testResults.httpOutput = Logger.collectOutput().map(item => {`
	`60`	`+ testResults.httpOutput = (httpOutput \|\| Logger.collectOutput()).map(item => {`
`61`	`61`	`return [item[0], this.ansiConverter.toHtml(item[1]),`
`62`	`62`	`(item[2] ? this.ansiConverter.toHtml(item[2]) : '')];`
`63`	`63`	`});`
`@@ -71,7 +71,7 @@ module.exports = class GlobalReporter {`
`71`	`71`	`if (!Concurrency.isTestWorker()) {`
`72`	`72`	`emitter.on('message', data => {`
`73`	`73`	`data = JSON.parse(data);`
`74`		`- this.addTestSuiteResults(data.results);`
	`74`	`+ this.addTestSuiteResults(data.results, data.httpOutput);`
`75`	`75`	`});`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,8 @@ class TestSuite {`
`598`	`598`	`process.send(SafeJSON.stringify({`
`599`	`599`	`type: 'testsuite_finished',`
`600`	`600`	`itemKey: process.env.__NIGHTWATCH_ENV_LABEL,`
`601`		`- results: this.reporter.exportResults()`
	`601`	`+ results: this.reporter.exportResults(),`
	`602`	`+ httpOutput: Logger.collectOutput()`
`602`	`603`	`}));`
`603`	`604`	`}`
`604`	`605`