Title: [159696] trunk/Tools
- Revision
- 159696
- Author
- [email protected]
- Date
- 2013-11-22 09:46:12 -0800 (Fri, 22 Nov 2013)
Log Message
Unreviewed, rolling out r159690.
http://trac.webkit.org/changeset/159690
https://bugs.webkit.org/show_bug.cgi?id=124782
Broke webkitpy tests (Requested by ap on #webkit).
* Scripts/webkitpy/tool/bot/queueengine.py:
(QueueEngine.run):
(QueueEngine._open_work_log):
(QueueEngine._ensure_work_log_closed):
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
(AbstractEarlyWarningSystem.review_patch):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (159695 => 159696)
--- trunk/Tools/ChangeLog 2013-11-22 17:44:03 UTC (rev 159695)
+++ trunk/Tools/ChangeLog 2013-11-22 17:46:12 UTC (rev 159696)
@@ -1,3 +1,18 @@
+2013-11-22 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r159690.
+ http://trac.webkit.org/changeset/159690
+ https://bugs.webkit.org/show_bug.cgi?id=124782
+
+ Broke webkitpy tests (Requested by ap on #webkit).
+
+ * Scripts/webkitpy/tool/bot/queueengine.py:
+ (QueueEngine.run):
+ (QueueEngine._open_work_log):
+ (QueueEngine._ensure_work_log_closed):
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ (AbstractEarlyWarningSystem.review_patch):
+
2013-11-22 László Langó <[email protected]>
EWS creates 0 byte sized log files
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py (159695 => 159696)
--- trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py 2013-11-22 17:44:03 UTC (rev 159695)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py 2013-11-22 17:46:12 UTC (rev 159696)
@@ -97,13 +97,14 @@
self._sleep("No work item.")
continue
+ # FIXME: Work logs should not depend on bug_id specificaly.
+ # This looks fixed, no?
+ self._open_work_log(work_item)
try:
if not self._delegate.process_work_item(work_item):
_log.warning("Unable to process work item.")
continue
except ScriptError, e:
- self._open_work_log(work_item)
- self._work_log.write(e.message_with_output())
# Use a special exit code to indicate that the error was already
# handled in the child process and we should just keep looping.
if e.exit_code == self.handled_error_code:
@@ -138,12 +139,12 @@
work_item_log_path = self._delegate.work_item_log_path(work_item)
if not work_item_log_path:
return
- self._work_log = self._output_tee._open_log_file(work_item_log_path)
+ self._work_log = self._output_tee.add_log(work_item_log_path)
def _ensure_work_log_closed(self):
# If we still have a bug log open, close it.
if self._work_log:
- self._work_log.close()
+ self._output_tee.remove_log(self._work_log)
self._work_log = None
def _now(self):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (159695 => 159696)
--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2013-11-22 17:44:03 UTC (rev 159695)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2013-11-22 17:46:12 UTC (rev 159696)
@@ -92,7 +92,10 @@
if results_archive:
self._upload_results_archive_for_patch(patch, results_archive)
self._did_fail(patch)
- raise e
+ # FIXME: We're supposed to be able to raise e again 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
# EarlyWarningSystemDelegate methods
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
