No subject
Mon Jan 28 08:41:14 PST 2013
* Scripts/webkitpy/tool/bot/queueengine.py:
(QueueEngine.run): If the build and tests pass, there is no ScriptError r=
aised,
there is nothing to log. Open the log file only if a ScriptError was rais=
ed to
avoid to make empty log files for bugs.
(QueueEngine._open_work_log): Does not need to tee STDOUT to log file any=
more,
because of changes in <a href=3D"http://trac.webkit.org/projects/webkit/c=
hangeset/138264">r138264</a>. Teeing is used for locally testing purposes=
and
this feature is not used anymore.
(QueueEngine._ensure_work_log_closed): Close the logfile. We don't use ou=
tput
teeing anymore. It is a necessary change because of QueueEngine._open_wor=
k_log
change.
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
(AbstractEarlyWarningSystem.review_patch): Raise again the captured Scrip=
tError
to be able to handle it in QueueEngine.run. Without this change, the exis=
ting
exception handler never run (the process_work_item method never raise Scr=
iptError)
We can get the error message only from the ScriptError at this point.</pr=
e>
<h3>Modified Paths</h3>
<ul>
<li><a href=3D"#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href=3D"#trunkToolsScriptswebkitpytoolbotqueueenginepy">trunk/Tool=
s/Scripts/webkitpy/tool/bot/queueengine.py</a></li>
<li><a href=3D"#trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy=
">trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py</a></l=
i>
</ul>
</div>
<div id=3D"patch">
<h3>Diff</h3>
<a id=3D"trunkToolsChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Tools/ChangeLog (159689 =3D> 1=
59690)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Tools/ChangeLog 2013-11-22 16:07:31 UTC (r=
ev 159689)
+++ trunk/Tools/ChangeLog 2013-11-22 16:26:27 UTC (rev 159690)
</span><span class=3D"lines">@@ -1,3 +1,32 @@
</span><ins>+2013-11-22 L=C3=A1szl=C3=B3 Lang=C3=B3 <lango at inf.u-sze=
ged.hu>
+
+ EWS creates 0 byte sized log files
+ https://bugs.webkit.org/show_bug.cgi?id=3D107606
+
+ Reviewed by Ryosuke Niwa.
+
+ There was a modification in r138264, that tried to make less log=
,=20
+ because some of the messeges were duplicated. After this the EWS=
=20
+ created the log file (with the same name as the bugID) but doesn=
't=20
+ write anything into it, even if there were errors during the bui=
ld.=20
+ From now only creates the log file only if there is some error.
+
+ * Scripts/webkitpy/tool/bot/queueengine.py:
+ (QueueEngine.run): If the build and tests pass, there is no Scri=
ptError raised,
+ there is nothing to log. Open the log file only if a ScriptError=
was raised to
+ avoid to make empty log files for bugs.
+ (QueueEngine._open_work_log): Does not need to tee STDOUT to log=
file anymore,
+ because of changes in r138264. Teeing is used for locally testin=
g purposes and
+ this feature is not used anymore.
+ (QueueEngine._ensure_work_log_closed): Close the logfile. We don=
't use output=20
+ teeing anymore. It is a necessary change because of QueueEngine.=
_open_work_log
+ change.
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ (AbstractEarlyWarningSystem.review_patch): Raise again the captu=
red ScriptError
+ to be able to handle it in QueueEngine.run. Without this change,=
the existing
+ exception handler never run (the process_work_item method never =
raise ScriptError)
+ We can get the error message only from the ScriptError at this p=
oint.
+
</ins><span class=3D"cx"> 2013-11-21 Peter Molnar <pmolnar.u-szeged@=
partner.samsung.com>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Remove ENABLE_WORKERS
</span></span></pre></div>
<a id=3D"trunkToolsScriptswebkitpytoolbotqueueenginepy"></a>
<div class=3D"modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bo=
t/queueengine.py (159689 =3D> 159690)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Tools/Scripts/webkitpy/tool/bot/queueengin=
e.py 2013-11-22 16:07:31 UTC (rev 159689)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py 2013-11-22 16:26=
:27 UTC (rev 159690)
</span><span class=3D"lines">@@ -97,14 +97,13 @@
</span><span class=3D"cx"> self._sleep("No work =
item.")
</span><span class=3D"cx"> continue
</span><span class=3D"cx">=20
</span><del>- # FIXME: Work logs should not depend on bug_=
id specificaly.
- # This looks fixed, no?
- self._open_work_log(work_item)
</del><span class=3D"cx"> try:
</span><span class=3D"cx"> if not self._delegate.proc=
ess_work_item(work_item):
</span><span class=3D"cx"> _log.warning("Una=
ble to process work item.")
</span><span class=3D"cx"> continue
</span><span class=3D"cx"> except ScriptError, e:
</span><ins>+ self._open_work_log(work_item)
+ self._work_log.write(e.message_with_output())
</ins><span class=3D"cx"> # Use a special exit code t=
o indicate that the error was already
</span><span class=3D"cx"> # handled in the child pro=
cess and we should just keep looping.
</span><span class=3D"cx"> if e.exit_code =3D=3D self=
.handled_error_code:
</span><span class=3D"lines">@@ -139,12 +138,12 @@
</span><span class=3D"cx"> work_item_log_path =3D self._delegate.=
work_item_log_path(work_item)
</span><span class=3D"cx"> if not work_item_log_path:
</span><span class=3D"cx"> return
</span><del>- self._work_log =3D self._output_tee.add_log(work_ite=
m_log_path)
</del><ins>+ self._work_log =3D self._output_tee._open_log_file(wo=
rk_item_log_path)
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> def _ensure_work_log_closed(self):
</span><span class=3D"cx"> # If we still have a bug log open, clo=
se it.
</span><span class=3D"cx"> if self._work_log:
</span><del>- self._output_tee.remove_log(self._work_log)
</del><ins>+ self._work_log.close()
</ins><span class=3D"cx"> self._work_log =3D None
</span><span class=3D"cx">=20
</span><span class=3D"cx"> def _now(self):
</span></span></pre></div>
<a id=3D"trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy"></a>
<div class=3D"modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/co=
mmands/earlywarningsystem.py (159689 =3D> 159690)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Tools/Scripts/webkitpy/tool/commands/early=
warningsystem.py 2013-11-22 16:07:31 UTC (rev 159689)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2013=
-11-22 16:26:27 UTC (rev 159690)
</span><span class=3D"lines">@@ -92,10 +92,7 @@
</span><span class=3D"cx"> if results_archive:
</span><span class=3D"cx"> self._upload_results_archive_f=
or_patch(patch, results_archive)
</span><span class=3D"cx"> self._did_fail(patch)
</span><del>- # FIXME: We're supposed to be able to raise e ag=
ain here and have
- # one of our base classes mark the patch as fail, but there =
seems
- # to be an issue with the exit_code.
- return False
</del><ins>+ raise e
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> # EarlyWarningSystemDelegate methods
</span><span class=3D"cx">=20
</span></span></pre>
</div>
</div>
</body>
</html>
More information about the webkit-changes
mailing list