Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1508)

Unified Diff: run_test_cases.py

Issue 12976005: Get rid of the single test_case code path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/swarm_client
Patch Set: Rebase take two Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/gtest_fake/expected.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: run_test_cases.py
diff --git a/run_test_cases.py b/run_test_cases.py
index a9c8febc764d1f29ee9d2faf30ae88d9d28da9b2..1bf62d2c6147bb02b784acd31cf206fe0d3aecfa 100755
--- a/run_test_cases.py
+++ b/run_test_cases.py
@@ -850,23 +850,8 @@ class Runner(object):
# TODO(maruel): Be more intelligent than decoding to ascii.
utf8_output = output.decode('ascii', 'ignore').encode('utf-8')
- if len(test_cases) > 1:
- data = process_output(
- utf8_output.splitlines(True), test_cases)
- data = normalize_testing_time(data, duration, returncode)
- else:
- if '[ RUN ]' not in output:
- # Can't find gtest marker, mark it as invalid.
- returncode = returncode or 1
- data = [
- {
- 'test_case': test_cases[0],
- 'returncode': returncode,
- 'duration': duration,
- 'output': utf8_output,
- }
- ]
-
+ data = process_output(utf8_output.splitlines(True), test_cases)
+ data = normalize_testing_time(data, duration, returncode)
data = chromium_filter_tests(data)
if sys.platform == 'win32':
« no previous file with comments | « no previous file | tests/gtest_fake/expected.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698