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

Side by Side Diff: build/android/pylib/gtest/gtest_test_instance.py

Issue 2582263003: [Android] Fix empty gtest test name parsing. (Closed)
Patch Set: Created 4 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/android/pylib/gtest/gtest_test_instance_test.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import HTMLParser 5 import HTMLParser
6 import logging 6 import logging
7 import os 7 import os
8 import re 8 import re
9 import tempfile 9 import tempfile
10 import threading 10 import threading
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 A list of all tests. For the above raw listing: 92 A list of all tests. For the above raw listing:
93 93
94 [IPCChannelTest.SendMessageInChannelConnected, IPCSyncChannelTest.Simple, 94 [IPCChannelTest.SendMessageInChannelConnected, IPCSyncChannelTest.Simple,
95 IPCSyncChannelTest.DISABLED_SendWithTimeoutMixedOKAndTimeout] 95 IPCSyncChannelTest.DISABLED_SendWithTimeoutMixedOKAndTimeout]
96 """ 96 """
97 ret = [] 97 ret = []
98 current = '' 98 current = ''
99 for test in raw_list: 99 for test in raw_list:
100 if not test: 100 if not test:
101 continue 101 continue
102 if test[0] != ' ': 102 if not test.startswith(' '):
103 test_case = test.split()[0] 103 test_case = test.split()[0]
104 if test_case.endswith('.'): 104 if test_case.endswith('.'):
105 current = test_case 105 current = test_case
106 elif not 'YOU HAVE' in test: 106 else:
107 test_name = test.split()[0] 107 test = test.strip()
108 ret += [current + test_name] 108 if test and not 'YOU HAVE' in test:
109 test_name = test.split()[0]
110 ret += [current + test_name]
109 return ret 111 return ret
110 112
111 113
112 def ParseGTestOutput(output): 114 def ParseGTestOutput(output):
113 """Parses raw gtest output and returns a list of results. 115 """Parses raw gtest output and returns a list of results.
114 116
115 Args: 117 Args:
116 output: A list of output lines. 118 output: A list of output lines.
117 Returns: 119 Returns:
118 A list of base_test_result.BaseTestResults. 120 A list of base_test_result.BaseTestResults.
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 '%s' % l for l in (line.strip() for line in disabled_tests_file) 476 '%s' % l for l in (line.strip() for line in disabled_tests_file)
475 if l and not l.startswith('#')] 477 if l and not l.startswith('#')]
476 478
477 return '*-%s' % ':'.join(disabled_filter_items) 479 return '*-%s' % ':'.join(disabled_filter_items)
478 480
479 #override 481 #override
480 def TearDown(self): 482 def TearDown(self):
481 """Do nothing.""" 483 """Do nothing."""
482 pass 484 pass
483 485
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/gtest/gtest_test_instance_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698