From 9365502c079a6a376b7f6f83556e920146925f64 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Mon, 9 Jun 2014 17:42:14 -0700 Subject: failures_lib: do not print the textual tracebacks for CompoundFailure Including the textual tracebacks in __str__ makes the failure reason hard to read on the waterfall. Remove the tracebacks from __str__, but still print them in HandleExceptionAsError/Warning for debugging purpose. BUG=chromium:382731 TEST=`cbuildbot/run_tests` Change-Id: Iea992dbda67d734cdeaa3c2c4e33e1375354680b Reviewed-on: https://chromium-review.googlesource.com/203177 Tested-by: Yu-Ju Hong Reviewed-by: Yu-Ju Hong Commit-Queue: Yu-Ju Hong --- cbuildbot/stages/generic_stages.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cbuildbot/stages/generic_stages.py') diff --git a/cbuildbot/stages/generic_stages.py b/cbuildbot/stages/generic_stages.py index 7539d563c..3d70508ad 100644 --- a/cbuildbot/stages/generic_stages.py +++ b/cbuildbot/stages/generic_stages.py @@ -265,7 +265,9 @@ class BuilderStage(object): A string description of the exception. """ exc_type, exc_value = exc_info[:2] - if issubclass(exc_type, failures_lib.StepFailure): + if issubclass(exc_type, failures_lib.CompoundFailure): + return exc_value.ToFullMessage() + elif issubclass(exc_type, failures_lib.StepFailure): return str(exc_value) else: return ''.join(traceback.format_exception(*exc_info)) -- cgit v1.2.3