Index: chrome/test/functional/perf/endure_result_parser.py |
diff --git a/chrome/test/functional/perf/endure_result_parser.py b/chrome/test/functional/perf/endure_result_parser.py |
index d120098a11aeaeee8c8796856feeb492bc7a3781..f477270e4895f0d87f820cc3c28bcf34a7d96666 100755 |
--- a/chrome/test/functional/perf/endure_result_parser.py |
+++ b/chrome/test/functional/perf/endure_result_parser.py |
@@ -12,13 +12,7 @@ stored in local text files to be graphed by the Chrome Endure graphing code. |
It is assumed that any Chrome Endure tests that show up on the waterfall have |
names that are of the following form: |
-"endure_<webapp_name>-<test_name>" (non-Web Page Replay tests) |
- |
-or |
- |
-"endure_<webapp_name>_wpr-<test_name>" (Web Page Replay tests) |
- |
-For example: "endure_gmail_wpr-testGmailComposeDiscard" |
+"endure_<webapp_name>-<test_name>" |
This script accepts either a URL or a local path as a buildbot location. |
It switches its behavior if a URL is given, or a local path is given. |
@@ -426,23 +420,12 @@ def ExtractTestNames(log_location, is_dbg): |
if log_location.startswith('http://'): |
location = urllib.unquote(log_location) |
test_pattern = r'endure_([^_]+)(_test |-)([^/]+)/' |
- wpr_test_pattern = r'endure_([^_]+)_wpr(_test |-)([^/]+)/' |
else: |
location = log_location |
test_pattern = r'endure_([^_]+)(_test_|-)([^/]+)-stdio' |
- wpr_test_pattern = 'endure_([^_]+)_wpr(_test_|-)([^/]+)-stdio' |
- |
- found_wpr_result = False |
- match = re.findall(test_pattern, location) |
- if not match: |
- match = re.findall(wpr_test_pattern, location) |
- if match: |
- found_wpr_result = True |
- else: |
- logging.error('Test name not in expected format: ' + location) |
- return False |
+ |
match = match[0] |
- webapp_name = match[0] + '_wpr' if found_wpr_result else match[0] |
+ webapp_name = match[0] |
webapp_name = webapp_name + '_dbg' if is_dbg else webapp_name |
test_name = match[2] |