summaryrefslogtreecommitdiff
path: root/cbuildbot/stages/generic_stages.py
diff options
context:
space:
mode:
authorYu-Ju Hong <yjhong@chromium.org>2014-06-09 17:42:14 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-06-10 12:39:58 +0000
commit9365502c079a6a376b7f6f83556e920146925f64 (patch)
tree6b5b26a27e51ff63ed446a126c4b6900be8fe7e4 /cbuildbot/stages/generic_stages.py
parent4a8f8aa3ea3d33f3d00612dc62304ffc21e019e6 (diff)
downloadchromite-9365502c079a6a376b7f6f83556e920146925f64.tar.gz
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 <yjhong@chromium.org> Reviewed-by: Yu-Ju Hong <yjhong@chromium.org> Commit-Queue: Yu-Ju Hong <yjhong@chromium.org>
Diffstat (limited to 'cbuildbot/stages/generic_stages.py')
-rw-r--r--cbuildbot/stages/generic_stages.py4
1 files changed, 3 insertions, 1 deletions
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))