Adjust message formatters

This commit is contained in:
Sergio Durigan Junior 2016-11-06 01:15:26 -04:00
parent 3c736356e5
commit c0ab924f25

View file

@ -254,7 +254,7 @@ subsequent commits are made after X, by different people."""
def MessageGDBTesters (mode, name, build, results, master_status): def MessageGDBTesters (mode, name, build, results, master_status):
"""This function is responsible for composing the message that will be """This function is responsible for composing the message that will be
send to the gdb-testers mailing list.""" send to the gdb-testers mailing list."""
git_url = "http://gdb-build.sergiodj.net/cgit" res_url = "http://gdb-build.sergiodj.net/cgit"
branch = build.getSourceStamps ()[0].branch branch = build.getSourceStamps ()[0].branch
cur_change = build.getSourceStamps ()[0].changes[0] cur_change = build.getSourceStamps ()[0].changes[0]
properties = build.getProperties () properties = build.getProperties ()
@ -297,13 +297,16 @@ send to the gdb-testers mailing list."""
# URL to find more info about what went wrong. # URL to find more info about what went wrong.
text += "\nTestsuite log (gdb.sum and gdb.log) URL(s):\n" text += "\nTestsuite log (gdb.sum and gdb.log) URL(s):\n"
for ss in ss_list: text += "\t<%s/%s/%s/%s/>\n" % (res_url, name, sourcestamp.revision[:2],
commit_id = get_builder_commit_id (name, ss.revision, ss.branch) sourcestamp.revision)
if commit_id:
text += "\t<%s/%s/.git/tree/?h=%s&id=%s>\n" % (git_url, name, quote (ss.branch), # for ss in ss_list:
commit_id) # commit_id = get_builder_commit_id (name, ss.revision, ss.branch)
else: # if commit_id:
text += "\t<Error fetching commit ID for %s>\n" % ss.revision # text += "\t<%s/%s/.git/tree/?h=%s&id=%s>\n" % (git_url, name, quote (ss.branch),
# commit_id)
# else:
# text += "\t<Error fetching commit ID for %s>\n" % ss.revision
# Including the 'regressions' log. This is the 'diff' of what # Including the 'regressions' log. This is the 'diff' of what
# went wrong. # went wrong.
@ -411,7 +414,7 @@ send to the gdb-testers mailing list."""
def MessageGDBTestersTryBuild (mode, name, build, results, master_status): def MessageGDBTestersTryBuild (mode, name, build, results, master_status):
"""This function is responsible for composing the message that will be """This function is responsible for composing the message that will be
send to the gdb-testers mailing list.""" send to the gdb-testers mailing list."""
git_url = "http://gdb-build.sergiodj.net/cgit" res_url = "http://gdb-build.sergiodj.net/results"
branch = build.getSourceStamps ()[0].branch branch = build.getSourceStamps ()[0].branch
sourcestamp = build.getSourceStamps ()[0] sourcestamp = build.getSourceStamps ()[0]
cur_change = sourcestamp.patch[1] cur_change = sourcestamp.patch[1]
@ -444,14 +447,17 @@ send to the gdb-testers mailing list."""
# URL to find more info about what went wrong. # URL to find more info about what went wrong.
text += "\nTestsuite log (gdb.sum and gdb.log) URL(s):\n" text += "\nTestsuite log (gdb.sum and gdb.log) URL(s):\n"
commit_id = get_builder_commit_id (name, sourcestamp.revision, text += "\t<%s/%s/%s/%s/>\n" % (res_url, name, sourcestamp.revision[:2],
sourcestamp.branch) sourcestamp.revision)
if commit_id:
text += "\t<%s/%s/.git/tree/?h=%s&id=%s>\n" % (git_url, name, # commit_id = get_builder_commit_id (name, sourcestamp.revision,
quote (sourcestamp.branch), # sourcestamp.branch)
commit_id) # if commit_id:
else: # text += "\t<%s/%s/.git/tree/?h=%s&id=%s>\n" % (git_url, name,
text += "\t<Error fetching commit ID for %s>\n" % sourcestamp.revision # quote (sourcestamp.branch),
# commit_id)
# else:
# text += "\t<Error fetching commit ID for %s>\n" % sourcestamp.revision
# found_regressions will be True if the 'regressions' log is not # found_regressions will be True if the 'regressions' log is not
# empty. # empty.