Attachment 341368 Details for Bug 175696 – Updated patch

[patch] Updated patch

patch_ews_print_complete_error_v2.patch (text/plain), 6.25 KB, created by Aakash Jain on 2018-05-25 18:02:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2018-05-25 18:02:03 PDT

Size: 6.25 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 232219)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2018-05-25  Aakash Jain  <aakash_jain@apple.com>
>+
>+        Display detailed error logs when a script fails in EWS
>+        https://bugs.webkit.org/show_bug.cgi?id=175696
>+        <rdar://problem/34841885>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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  <dabates@apple.com>
> 
>         test-webkitpy messages logged using __main__ logger are not displayed
>Index: Tools/Scripts/webkitpy/tool/bot/queueengine.py
>===================================================================
>--- Tools/Scripts/webkitpy/tool/bot/queueengine.py	(revision 232219)
>+++ Tools/Scripts/webkitpy/tool/bot/queueengine.py	(working copy)
>@@ -105,12 +105,12 @@ class QueueEngine:
>                         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.")
>Index: Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py
>===================================================================
>--- Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py	(revision 232219)
>+++ Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py	(working copy)
>@@ -49,7 +49,7 @@ class AbstractSequencedCommand(Command):
>         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)
>Index: Tools/Scripts/webkitpy/tool/commands/download.py
>===================================================================
>--- Tools/Scripts/webkitpy/tool/commands/download.py	(revision 232219)
>+++ Tools/Scripts/webkitpy/tool/commands/download.py	(working copy)
>@@ -201,7 +201,7 @@ class AbstractPatchSequencingCommand(Abs
>         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)
> 
>Index: Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
>===================================================================
>--- Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py	(revision 232219)
>+++ Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py	(working copy)
>@@ -160,7 +160,7 @@ class AbstractEarlyWarningSystem(Abstrac
>     @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):
>Index: Tools/Scripts/webkitpy/tool/commands/queues.py
>===================================================================
>--- Tools/Scripts/webkitpy/tool/commands/queues.py	(revision 232219)
>+++ Tools/Scripts/webkitpy/tool/commands/queues.py	(working copy)
>@@ -367,7 +367,7 @@ class CommitQueue(PatchProcessingQueue, 
>     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 @@ class CommitQueue(PatchProcessingQueue, 
>         # 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):
>Index: Tools/Scripts/webkitpy/tool/commands/stepsequence.py
>===================================================================
>--- Tools/Scripts/webkitpy/tool/commands/stepsequence.py	(revision 232219)
>+++ Tools/Scripts/webkitpy/tool/commands/stepsequence.py	(working copy)
>@@ -79,7 +79,7 @@ class StepSequence(object):
>             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)

Actions: View | Formatted Diff | Diff

Attachments on bug 175696: 318438 | 341368