<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[154419] contrib/buildbot-test/master.cfg</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/154419">154419</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2016-10-29 03:10:04 +0200 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: Improve portWatcherMessageFormatter
- Try not to repeat ourselves.
- Omit the default "s" string format specification.
- Prefer `update()` over repeated `add()`s.
- Use tuple unpacking.
- Test nonempty sequences implicitly instead of using `len()`.
- Continue or exit early from loops to reduce indentation.
- Modifying function arguments is a C-inspired antipattern. Return
a tuple instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribbuildbottestmastercfg">contrib/buildbot-test/master.cfg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribbuildbottestmastercfg"></a>
<div class="modfile"><h4>Modified: contrib/buildbot-test/master.cfg (154418 => 154419)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-10-29 01:05:45 UTC (rev 154418)
+++ contrib/buildbot-test/master.cfg 2016-10-29 01:10:04 UTC (rev 154419)
</span><span class="lines">@@ -654,9 +654,8 @@
</span><span class="cx">
</span><span class="cx"> # same as original, but calls portMessageFormatter with access to interested_users
</span><span class="cx"> def buildMessageDict(self, name, build, results):
</span><del>- self.interested_users.clear()
- msgdict = self.portMessageFormatter(
- self.mode, name, build, results, self.master_status, self.interested_users)
</del><ins>+ msgdict, self.interested_users = self.portMessageFormatter(
+ self.mode, name, build, results, self.master_status)
</ins><span class="cx"> return msgdict
</span><span class="cx">
</span><span class="cx"> def useLookup(self, build):
</span><span class="lines">@@ -670,21 +669,23 @@
</span><span class="cx"> # dl.append(d)
</span><span class="cx"> return defer.gatherResults(dl)
</span><span class="cx">
</span><del>-def portWatcherMessageFormatter(mode, name, build, results, master_status, interested_users):
</del><ins>+def portWatcherMessageFormatter(mode, name, build, results, master_status):
+ interested_users = set()
</ins><span class="cx"> result = util.Results[results]
</span><del>- subject = 'Build {:s}'.format(result.title())
</del><ins>+ subject = 'Build {}'.format(result.title())
</ins><span class="cx"> text = list()
</span><del>- text.append('Status: {:s}'.format(result.title()))
- text.append('Build slave: {:s}'.format(build.getSlavename()))
- if master_status.getURLForThing(build):
- text.append('Full logs: {:s}'.format(master_status.getURLForThing(build)))
- text.append('Build reason: {:s}'.format(build.getReason()))
- text.append('Port list: {:s}'.format(build.getProperty('fullportlist')))
- text.append('Subport list:\n\t- {:s}'.format(build.getProperty('subportlist').replace(' ', '\n\t- ')))
- text.append('Variants: {:s}'.format(build.getProperty('variants')))
- text.append('Revision: {:s}'.format(build.getProperty('revision')))
- text.append('Build time: {:s}'.format(datetime.timedelta(seconds=int(round(build.getTimes()[1] - build.getTimes()[0])))))
- text.append(u'Committer: {:s}'.format(','.join(build.getResponsibleUsers())))
</del><ins>+ text.append('Status: {}'.format(result.title()))
+ text.append('Build slave: {}'.format(build.getSlavename()))
+ build_url = master_status.getURLForThing(build)
+ if build_url:
+ text.append('Full logs: {}'.format(build_url))
+ text.append('Build reason: {}'.format(build.getReason()))
+ text.append('Port list: {}'.format(build.getProperty('fullportlist')))
+ text.append('Subport list:\n\t- {}'.format(build.getProperty('subportlist').replace(' ', '\n\t- ')))
+ text.append('Variants: {}'.format(build.getProperty('variants')))
+ text.append('Revision: {}'.format(build.getProperty('revision')))
+ text.append('Build time: {}'.format(datetime.timedelta(seconds=int(round(build.getTimes()[1] - build.getTimes()[0])))))
+ text.append(u'Committer: {}'.format(','.join(build.getResponsibleUsers())))
</ins><span class="cx">
</span><span class="cx"> text.append('\nLog from failed builds:')
</span><span class="cx"> summary_step = [x for x in build.getSteps() if x.getName() == 'summary'][0]
</span><span class="lines">@@ -694,47 +695,44 @@
</span><span class="cx"> pattern = re.compile(r"^Building '(?P<port>.*?)'.*?(\(failed to install dependency '(?P<dependency>.*?)'\))?( maintainers: (?P<maintainers>.*?)[.])?$")
</span><span class="cx"> # iterate through all the ports being built
</span><span class="cx"> for line in summary_log.getText().splitlines():
</span><ins>+ if 'ERROR' not in line:
+ continue
</ins><span class="cx"> # in case of a build error, print the error and add the broken port(s) to the list
</span><del>- if 'ERROR' in line:
- line = line.replace(';', '@')
- text.append('\t' + line.replace(' maintainers:', '\n\t> maintainers:'))
- match = pattern.match(line)
- if match:
- for key in ['port', 'dependency']:
- port = match.groupdict().get(key)
- if port:
- failed_ports.add(port)
- maintainers = match.groupdict().get('maintainers')
- if maintainers:
- for maintainer in maintainers.split(','):
- maintainers_to_notify.add(maintainer)
- if len(failed_ports) > 0:
- text.append('\nBroken ports:\n\t- {:s}'.format('\n\t- '.join(sorted(failed_ports))))
</del><ins>+ line = line.replace(';', '@')
+ text.append('\t' + line.replace(' maintainers:', '\n\t> maintainers:'))
+ match = pattern.match(line)
+ if match:
+ port, dependency, maintainers = match.group('port', 'dependency', 'maintainers')
+ failed_ports.add(port)
+ if dependency:
+ failed_ports.add(dependency)
+ if maintainers:
+ maintainers_to_notify.update(maintainers.split(','))
</ins><span class="cx">
</span><del>- if len(maintainers_to_notify) > 0:
</del><ins>+ if failed_ports:
+ text.append('\nBroken ports:\n\t- {}'.format('\n\t- '.join(sorted(failed_ports))))
+ if maintainers_to_notify:
</ins><span class="cx"> text.append('\nResponsible maintainers:\n\t- {}'.format('\n\t- '.join(sorted(maintainers_to_notify))))
</span><del>- for user in maintainers_to_notify:
- interested_users.add(user)
</del><ins>+ interested_users.update(maintainers_to_notify)
</ins><span class="cx">
</span><span class="cx"> # links to individual builds
</span><span class="cx"> text.append('\nLinks to individual build jobs:')
</span><span class="cx"> trigger_step = [x for x in build.getSteps() if x.getName() == 'trigger'][0]
</span><del>- build_urls_dict = trigger_step.getURLs()
- # TODO; sorting won't work properly for
</del><ins>+ # FIXME Sorting is lexicographic and won't work properly for
</ins><span class="cx"> # - ports-10.11-x86_64-builder #99
</span><span class="cx"> # - ports-10.11-x86_64-builder #100
</span><del>- build_urls_keys = sorted(build_urls_dict.keys())
- for k in build_urls_keys:
- text.append('- {:s}\n {:s}'.format(k, build_urls_dict[k]))
- text.append('\n-- \nBest regards,\nMacPorts Buildbot\n{:s}'.format(c['buildbotURL']))
</del><ins>+ for label, url in sorted(trigger_step.getURLs().iteritems()):
+ text.append('- {}\n {}'.format(label, url))
+ text.append('\n-- \nBest regards,\nMacPorts Buildbot\n{}'.format(c['buildbotURL']))
</ins><span class="cx">
</span><span class="cx"> if failed_ports:
</span><del>- subject += ': '
- subject += ', '.join(sorted(failed_ports)[:10])
</del><ins>+ subject += ': ' + ', '.join(sorted(failed_ports)[:10])
</ins><span class="cx"> if len(failed_ports) > 10:
</span><span class="cx"> subject += ', and {} more'.format(len(failed_ports) - 10)
</span><del>- return {'body': '\n'.join(text), 'type': 'plain', 'subject': subject}
</del><span class="cx">
</span><ins>+ return ({'body': '\n'.join(text), 'type': 'plain', 'subject': subject},
+ interested_users)
+
</ins><span class="cx"> if config['production']:
</span><span class="cx"> # send mail about base failures to users on the blamelist
</span><span class="cx"> mn = status.MailNotifier(
</span></span></pre>
</div>
</div>
</body>
</html>