Bold text for xfail
This commit is contained in:
parent
8a36ee8761
commit
ab1eb22f3a
|
@ -130,11 +130,14 @@ class BaseTestReport:
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def separate_xfail_error(error):
|
def separate_xfail_error(error):
|
||||||
issue_id_list = re.findall(r'#\d+', error)
|
issue_id_list = re.findall(r'#\d+', error)
|
||||||
main_error, no_code_error_str, issue_id = error, '', ''
|
issue_id = issue_id_list[0] if issue_id_list else ''
|
||||||
if issue_id_list:
|
|
||||||
issue_id = issue_id_list[0]
|
xfail_error = re.findall(r'\[\[.*\]\]', error)
|
||||||
xfail_error = re.findall(r'\[\[.*\]\]', error)
|
if xfail_error:
|
||||||
if xfail_error:
|
no_code_error_str = xfail_error[0]
|
||||||
no_code_error_str = xfail_error[0]
|
main_error = error.replace(no_code_error_str, '')
|
||||||
main_error = error.replace(no_code_error_str, '')
|
else:
|
||||||
return (main_error, no_code_error_str, issue_id)
|
no_code_error_str = ''
|
||||||
|
main_error = error
|
||||||
|
|
||||||
|
return main_error, no_code_error_str, issue_id
|
||||||
|
|
|
@ -118,12 +118,12 @@ class GithubHtmlReport(BaseTestReport):
|
||||||
html += "%s" % ''.join(test_steps_html[-2:])
|
html += "%s" % ''.join(test_steps_html[-2:])
|
||||||
html += "</blockquote>"
|
html += "</blockquote>"
|
||||||
html += "</p>"
|
html += "</p>"
|
||||||
(code_error, no_code_error_str, issue_id) = self.separate_xfail_error(error)
|
code_error, no_code_error_str, _ = self.separate_xfail_error(error)
|
||||||
if no_code_error_str:
|
if no_code_error_str:
|
||||||
html += "<code>%s</code>" % code_error
|
html += "<code>%s</code>" % code_error
|
||||||
html += no_code_error_str
|
html += "<b>%s</b>" % no_code_error_str
|
||||||
else:
|
else:
|
||||||
html += "<code>%s</code>" % error
|
html += "<code>%s</code>" % error.replace("[[", "<b>[[").replace("]]", "]]</b>")
|
||||||
html += "<br/><br/>"
|
html += "<br/><br/>"
|
||||||
if test.group_name:
|
if test.group_name:
|
||||||
html += "<p><b>Class: %s</b></p>" % test.group_name
|
html += "<p><b>Class: %s</b></p>" % test.group_name
|
||||||
|
@ -140,9 +140,8 @@ class GithubHtmlReport(BaseTestReport):
|
||||||
html += "Device %d:" % i
|
html += "Device %d:" % i
|
||||||
html += "<ul>"
|
html += "<ul>"
|
||||||
if test_run.first_commands:
|
if test_run.first_commands:
|
||||||
html += "<li><a href=\"%s\">Steps, video, logs</a></li>" % self.get_sauce_job_url(job_id,
|
html += "<li><a href=\"%s\">Steps, video, logs</a></li>" % \
|
||||||
test_run.first_commands[
|
self.get_sauce_job_url(job_id, test_run.first_commands[job_id])
|
||||||
job_id])
|
|
||||||
else:
|
else:
|
||||||
html += "<li><a href=\"%s\">Steps, video, logs</a></li>" % self.get_sauce_job_url(job_id)
|
html += "<li><a href=\"%s\">Steps, video, logs</a></li>" % self.get_sauce_job_url(job_id)
|
||||||
if test_run.error:
|
if test_run.error:
|
||||||
|
|
|
@ -189,6 +189,7 @@ class TestrailReport(BaseTestReport):
|
||||||
error = "%s %s" % (code_error, test_rail_xfail)
|
error = "%s %s" % (code_error, test_rail_xfail)
|
||||||
else:
|
else:
|
||||||
error = full_error
|
error = full_error
|
||||||
|
error = error.replace("[[", "**").replace("]]", "**")
|
||||||
comment += '%s' % ('# Error: \n %s \n' % emoji.demojize(error)) + devices + test_steps
|
comment += '%s' % ('# Error: \n %s \n' % emoji.demojize(error)) + devices + test_steps
|
||||||
else:
|
else:
|
||||||
comment += devices + test_steps
|
comment += devices + test_steps
|
||||||
|
@ -257,9 +258,9 @@ class TestrailReport(BaseTestReport):
|
||||||
(code_error, no_code_error_str, issue_id) = self.separate_xfail_error(full_error)
|
(code_error, no_code_error_str, issue_id) = self.separate_xfail_error(full_error)
|
||||||
if issue_id:
|
if issue_id:
|
||||||
test_rail_xfail = self.make_error_with_gh_issue_link(no_code_error_str, issue_id)
|
test_rail_xfail = self.make_error_with_gh_issue_link(no_code_error_str, issue_id)
|
||||||
error = "```%s```\n %s \n" % (code_error, test_rail_xfail)
|
error = "```%s```\n **%s** \n" % (code_error, test_rail_xfail)
|
||||||
else:
|
else:
|
||||||
error = "```%s```\n" % full_error
|
error = "```%s```\n **%s** \n" % (code_error, no_code_error_str)
|
||||||
for job_id, f in last_testrun.jobs.items():
|
for job_id, f in last_testrun.jobs.items():
|
||||||
if last_testrun.first_commands:
|
if last_testrun.first_commands:
|
||||||
job_url = self.get_sauce_job_url(job_id=job_id,
|
job_url = self.get_sauce_job_url(job_id=job_id,
|
||||||
|
@ -305,5 +306,5 @@ class TestrailReport(BaseTestReport):
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def make_error_with_gh_issue_link(error, issue_id):
|
def make_error_with_gh_issue_link(error, issue_id):
|
||||||
return error.replace(issue_id, '[%s](https://github.com/status-im/status-react/issues/%s)' % (issue_id, issue_id[1:]))
|
return error.replace(issue_id,
|
||||||
|
'[%s](https://github.com/status-im/status-react/issues/%s)' % (issue_id, issue_id[1:]))
|
||||||
|
|
Loading…
Reference in New Issue