diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index 57318dbe4f..562a09cf1a 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -818,7 +818,7 @@ class OutputEventFilter(object): for stdout_chunk in stdout_chunks: event_data['counter'] = self._counter self._counter += 1 - event_data['stdout'] = stdout_chunk + event_data['stdout'] = stdout_chunk[:-2] if len(stdout_chunk) > 2 else "" n_lines = stdout_chunk.count('\n') event_data['start_line'] = self._start_line event_data['end_line'] = self._start_line + n_lines diff --git a/awx/ui/client/src/job-results/parse-stdout.service.js b/awx/ui/client/src/job-results/parse-stdout.service.js index 8c7e91f755..b8830d07a9 100644 --- a/awx/ui/client/src/job-results/parse-stdout.service.js +++ b/awx/ui/client/src/job-results/parse-stdout.service.js @@ -215,7 +215,7 @@ export default ['$log', 'moment', function($log, moment){ let padBy = lineNums.length - lines.length; for (let i = 0; i <= padBy; i++) { - lines.push("[1;imLine capped.[0m"); + lines.push(""); } } diff --git a/awx/ui/tests/spec/job-results/parse-stdout.service-test.js b/awx/ui/tests/spec/job-results/parse-stdout.service-test.js index c4aeace3e7..069a7d47eb 100644 --- a/awx/ui/tests/spec/job-results/parse-stdout.service-test.js +++ b/awx/ui/tests/spec/job-results/parse-stdout.service-test.js @@ -129,7 +129,7 @@ describe('parseStdoutService', () => { end_line: 11, stdout: "a\r\nb\r\nc..." }; - let expectedReturn = [[8, "a"],[9, "b"], [10,"c..."], [11, "[1;imLine capped.[0m"]]; + let expectedReturn = [[8, "a"],[9, "b"], [10,"c..."], [11, ""]]; let returnedEvent = parseStdoutService.getLineArr(mockEvent);