<!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>[244789] trunk/Tools</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 { 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="http://trac.webkit.org/projects/webkit/changeset/244789">244789</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2019-04-30 11:33:30 -0700 (Tue, 30 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ews-build] Parse and display bindings test failures
https://bugs.webkit.org/show_bug.cgi?id=197423

Reviewed by Lucas Forschler.

* BuildSlaveSupport/ews-build/steps.py:
(RunBindingsTests.__init__): Set timeout of 5 minutes.
(RunBindingsTests.start): Initialize log_observer for json output.
(RunBindingsTests.getResultSummary): Update step and build summary based on bindings test results.
(RunBindingsTests._addToLog): Method to add message to log.
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-test accordingly.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportewsbuildstepspy">trunk/Tools/BuildSlaveSupport/ews-build/steps.py</a></li>
<li><a href="#trunkToolsBuildSlaveSupportewsbuildsteps_unittestpy">trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportewsbuildstepspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (244788 => 244789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-04-30 18:29:13 UTC (rev 244788)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py    2019-04-30 18:33:30 UTC (rev 244789)
</span><span class="lines">@@ -467,7 +467,46 @@
</span><span class="cx">     logfiles = {'json': jsonFileName}
</span><span class="cx">     command = ['Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(jsonFileName)]
</span><span class="cx"> 
</span><ins>+    def __init__(self, **kwargs):
+        super(RunBindingsTests, self).__init__(timeout=5 * 60, **kwargs)
</ins><span class="cx"> 
</span><ins>+    def start(self):
+        self.log_observer = logobserver.BufferLogObserver()
+        self.addLogObserver('json', self.log_observer)
+        return shell.ShellCommand.start(self)
+
+    def getResultSummary(self):
+        if self.results == SUCCESS:
+            message = 'Passed bindings tests'
+            self.build.buildFinished([message], SUCCESS)
+            return {u'step': unicode(message)}
+
+        logLines = self.log_observer.getStdout()
+        json_text = ''.join([line for line in logLines.splitlines()])
+        try:
+            webkitpy_results = json.loads(json_text)
+        except Exception as ex:
+            self._addToLog('stderr', 'ERROR: unable to parse data, exception: {}'.format(ex))
+            return super(RunBindingsTests, self).getResultSummary()
+
+        failures = webkitpy_results.get('failures')
+        if not failures:
+            return super(RunBindingsTests, self).getResultSummary()
+        pluralSuffix = 's' if len(failures) > 1 else ''
+        failures_string = ', '.join([failure.replace('(JS) ', '') for failure in failures])
+        message = 'Found {} Binding test failure{}: {}'.format(len(failures), pluralSuffix, failures_string)
+        self.build.buildFinished([message], FAILURE)
+        return {u'step': unicode(message)}
+
+    @defer.inlineCallbacks
+    def _addToLog(self, logName, message):
+        try:
+            log = self.getLog(logName)
+        except KeyError:
+            log = yield self.addLog(logName)
+        log.addStdout(message)
+
+
</ins><span class="cx"> class RunWebKitPerlTests(shell.ShellCommand):
</span><span class="cx">     name = 'webkitperl-tests'
</span><span class="cx">     description = ['webkitperl-tests running']
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportewsbuildsteps_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (244788 => 244789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py        2019-04-30 18:29:13 UTC (rev 244788)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py   2019-04-30 18:33:30 UTC (rev 244789)
</span><span class="lines">@@ -294,12 +294,13 @@
</span><span class="cx">         self.setupStep(RunBindingsTests())
</span><span class="cx">         self.expectRemoteCommands(
</span><span class="cx">             ExpectShell(workdir='wkdir',
</span><ins>+                        timeout=300,
</ins><span class="cx">                         command=['Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(self.jsonFileName)],
</span><span class="cx">                         logfiles={'json': self.jsonFileName},
</span><span class="cx">                         )
</span><span class="cx">             + 0,
</span><span class="cx">         )
</span><del>-        self.expectOutcome(result=SUCCESS, state_string='bindings-tests')
</del><ins>+        self.expectOutcome(result=SUCCESS, state_string='Passed bindings tests')
</ins><span class="cx">         return self.runStep()
</span><span class="cx"> 
</span><span class="cx">     def test_failure(self):
</span><span class="lines">@@ -306,6 +307,7 @@
</span><span class="cx">         self.setupStep(RunBindingsTests())
</span><span class="cx">         self.expectRemoteCommands(
</span><span class="cx">             ExpectShell(workdir='wkdir',
</span><ins>+                        timeout=300,
</ins><span class="cx">                         command=['Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(self.jsonFileName)],
</span><span class="cx">                         logfiles={'json': self.jsonFileName},
</span><span class="cx">                         )
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (244788 => 244789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-04-30 18:29:13 UTC (rev 244788)
+++ trunk/Tools/ChangeLog       2019-04-30 18:33:30 UTC (rev 244789)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-04-30  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Parse and display bindings test failures
+        https://bugs.webkit.org/show_bug.cgi?id=197423
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (RunBindingsTests.__init__): Set timeout of 5 minutes.
+        (RunBindingsTests.start): Initialize log_observer for json output.
+        (RunBindingsTests.getResultSummary): Update step and build summary based on bindings test results.
+        (RunBindingsTests._addToLog): Method to add message to log.
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-test accordingly.
+
</ins><span class="cx"> 2019-04-30  Pablo Saavedra  <psaavedra@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed. Add myself as a committer.
</span></span></pre>
</div>
</div>

</body>
</html>