Diff
Modified: trunk/Tools/ChangeLog (232221 => 232222)
--- trunk/Tools/ChangeLog 2018-05-26 03:44:49 UTC (rev 232221)
+++ trunk/Tools/ChangeLog 2018-05-26 03:56:45 UTC (rev 232222)
@@ -1,3 +1,18 @@
+2018-05-25 Aakash Jain <[email protected]>
+
+ Display detailed error logs when a script fails in EWS
+ https://bugs.webkit.org/show_bug.cgi?id=175696
+ <rdar://problem/34841885>
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/tool/bot/queueengine.py: Set output_limit to 5000 characters instead of default 500 characters.
+ * Scripts/webkitpy/tool/commands/abstractsequencedcommand.py: Ditto.
+ * Scripts/webkitpy/tool/commands/download.py: Ditto.
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py: Ditto.
+ * Scripts/webkitpy/tool/commands/queues.py: Ditto.
+ * Scripts/webkitpy/tool/commands/stepsequence.py: Ditto.
+
2018-05-25 Daniel Bates <[email protected]>
test-webkitpy messages logged using __main__ logger are not displayed
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py (232221 => 232222)
--- trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py 2018-05-26 03:44:49 UTC (rev 232221)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py 2018-05-26 03:56:45 UTC (rev 232222)
@@ -105,12 +105,12 @@
continue
except ScriptError as e:
self._open_work_log(work_item)
- self._work_log.write(e.message_with_output())
+ self._work_log.write(e.message_with_output(output_limit=5000))
# 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:
continue
- message = "Unexpected failure when processing patch! Please file a bug against webkit-patch.\n%s" % e.message_with_output()
+ message = "Unexpected failure when processing patch! Please file a bug against webkit-patch.\n%s" % e.message_with_output(output_limit=5000)
self._delegate.handle_unexpected_error(work_item, message)
except TerminateQueue as e:
self._stopping("TerminateQueue exception received.")
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py (232221 => 232222)
--- trunk/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py 2018-05-26 03:44:49 UTC (rev 232221)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py 2018-05-26 03:56:45 UTC (rev 232222)
@@ -49,7 +49,7 @@
try:
state = self._prepare_state(options, args, tool)
except ScriptError as e:
- _log.error(e.message_with_output())
+ _log.error(e.message_with_output(output_limit=5000))
self._exit(e.exit_code or 2)
self._sequence.run_and_handle_errors(tool, options, state)
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download.py (232221 => 232222)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2018-05-26 03:44:49 UTC (rev 232221)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2018-05-26 03:56:45 UTC (rev 232222)
@@ -201,7 +201,7 @@
try:
self.state = self._prepare_state(options, args, tool)
except ScriptError as e:
- _log.error(e.message_with_output())
+ _log.error(e.message_with_output(output_limit=5000))
self._exit(e.exit_code or 2)
self._prepare_sequence.run_and_handle_errors(tool, options, self.state)
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (232221 => 232222)
--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2018-05-26 03:44:49 UTC (rev 232221)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2018-05-26 03:56:45 UTC (rev 232222)
@@ -160,7 +160,7 @@
@classmethod
def handle_script_error(cls, tool, state, script_error):
# FIXME: Why does this not exit(1) like the superclass does?
- _log.error(script_error.message_with_output())
+ _log.error(script_error.message_with_output(output_limit=5000))
@classmethod
def load_ews_classes(cls):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (232221 => 232222)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2018-05-26 03:44:49 UTC (rev 232221)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2018-05-26 03:56:45 UTC (rev 232222)
@@ -367,7 +367,7 @@
def _error_message_for_bug(self, task, patch, script_error):
message = self._failing_tests_message(task, patch)
if not message:
- message = script_error.message_with_output()
+ message = script_error.message_with_output(output_limit=5000)
results_link = self._tool.status_server.results_url_for_status(task.failure_status_id)
return "%s\nFull output: %s" % (message, results_link)
@@ -415,7 +415,7 @@
# Hitting this error handler should be pretty rare. It does occur,
# however, when a patch no longer applies to top-of-tree in the final
# land step.
- _log.error(script_error.message_with_output())
+ _log.error(script_error.message_with_output(output_limit=5000))
@classmethod
def handle_checkout_needs_update(cls, tool, state, options, error):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/stepsequence.py (232221 => 232222)
--- trunk/Tools/Scripts/webkitpy/tool/commands/stepsequence.py 2018-05-26 03:44:49 UTC (rev 232221)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/stepsequence.py 2018-05-26 03:56:45 UTC (rev 232222)
@@ -79,7 +79,7 @@
QueueEngine.exit_after_handled_error(e)
except ScriptError as e:
if not options.quiet:
- _log.error(e.message_with_output())
+ _log.error(e.message_with_output(output_limit=5000))
if options.parent_command:
command = tool.command_by_name(options.parent_command)
command.handle_script_error(tool, state, e)
