summaryrefslogtreecommitdiffstats
path: root/testing/chromoting
diff options
context:
space:
mode:
authoranandc <anandc@chromium.org>2015-04-21 07:20:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-21 14:20:49 +0000
commit980e2f7b0969870c7a94d50c90429506314651e0 (patch)
treede94ca639c1c0c31884493cac21ca9555e6e2faf /testing/chromoting
parent4ace30111ef04a3b96897e597e9e121d724377ac (diff)
downloadchromium_src-980e2f7b0969870c7a94d50c90429506314651e0.zip
chromium_src-980e2f7b0969870c7a94d50c90429506314651e0.tar.gz
chromium_src-980e2f7b0969870c7a94d50c90429506314651e0.tar.bz2
A side-effect of this CL to summarise failing tests: https://codereview.chromium.org/1060613003/, was to lose information on output of failing tests. This CL restores that by recording the output of tests that thrown an exception during execution.
BUG= Review URL: https://codereview.chromium.org/1096143004 Cr-Commit-Position: refs/heads/master@{#326028}
Diffstat (limited to 'testing/chromoting')
-rw-r--r--testing/chromoting/browser_tests_launcher.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/testing/chromoting/browser_tests_launcher.py b/testing/chromoting/browser_tests_launcher.py
index 053ea5e..2fceb7c 100644
--- a/testing/chromoting/browser_tests_launcher.py
+++ b/testing/chromoting/browser_tests_launcher.py
@@ -50,9 +50,8 @@ def RunCommandInSubProcess(command):
results = subprocess.check_output(cmd_line, stderr=subprocess.STDOUT,
shell=True)
except subprocess.CalledProcessError, e:
- raise Exception('Exception %s running command %s\n' %
- (e, command))
- else:
+ results = e.output
+ finally:
print results
return results
@@ -196,7 +195,7 @@ def main(args):
# Was there any test failure?
if TEST_FAILURE:
print '++++++++++AT LEAST 1 TEST FAILED++++++++++'
- print FAILING_TESTS
+ print FAILING_TESTS.rstrip('\n')
print '++++++++++++++++++++++++++++++++++++++++++'
raise Exception('At least one test failed.')