External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8679 from AlanCoding/text_soup

Browse Source 
Apply more rigor to asserting text in stdout

Reviewed-by: awxbot
             https://github.com/awxbot
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-11-25 15:49:29 +00:00 committed by GitHub
commit 9921887ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awxkit/awxkit/api/pages/unified_jobs.py
View File

@ -46,9 +46,11 @@ class UnifiedJob(HasStatus, base.Base):
Additionally, you may replace any ' ' with another character (including ''). This is applied after the newline
replacement. Default behavior is to not replace spaces.
"""
self.wait_until_completed()
stdout = self.result_stdout
if replace_newlines is not None:
stdout = stdout.replace('\n', replace_newlines)
# make text into string with no line breaks, but watch out for trailing whitespace
stdout = replace_newlines.join([line.strip() for line in stdout.split('\n')])
if replace_spaces is not None:
stdout = stdout.replace(' ', replace_spaces)
if expected_text not in stdout: