Chromium Code Reviews| Index: tools/telemetry/telemetry/page_runner.py |
| diff --git a/tools/telemetry/telemetry/page_runner.py b/tools/telemetry/telemetry/page_runner.py |
| index 80f3a3866f2c84a0149c930572984216a153144a..09e6118cb022c165bea166df4a01b1a4eb6f6dab 100644 |
| --- a/tools/telemetry/telemetry/page_runner.py |
| +++ b/tools/telemetry/telemetry/page_runner.py |
| @@ -3,6 +3,7 @@ |
| # found in the LICENSE file. |
| import logging |
| import os |
| +import re |
| import time |
| import traceback |
| import urlparse |
| @@ -34,7 +35,7 @@ class _RunState(object): |
| self.browser.Close() |
| self.browser = None |
| -def _ShufflePageSet(page_set, options): |
| +def _ShuffleAndFilterPageSet(page_set, options): |
| if options.test_shuffle_order_file and not options.test_shuffle: |
| raise Exception('--test-shuffle-order-file requires --test-shuffle.') |
| @@ -42,6 +43,10 @@ def _ShufflePageSet(page_set, options): |
| return page_set.ReorderPageSet(options.test_shuffle_order_file) |
| pages = page_set.pages[:] |
| + if options.page_filter: |
|
nduca
2013/01/09 21:47:19
Should we use globbing instead of regex? Lets use
marja
2013/01/10 13:39:59
I think the syntax which --gtest_filter uses is ob
|
| + page_regex = re.compile(options.page_filter) |
| + pages = [page for page in pages if page_regex.search(page.url)] |
| + |
| if options.test_shuffle: |
| random.Random().shuffle(pages) |
| return [page |
| @@ -104,7 +109,7 @@ http://goto/read-src-internal, or create a new archive using record_wpr. |
| raise Exception('Trace directory isn\'t empty: %s' % options.trace_dir) |
| # Reorder page set based on options. |
| - pages = _ShufflePageSet(self.page_set, options) |
| + pages = _ShuffleAndFilterPageSet(self.page_set, options) |
| state = _RunState() |
| try: |