diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 10:50:18 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 10:50:18 +0000 |
| commit | 933df47c743604207d9d0836dff94a20eddd24f6 (patch) | |
| tree | 17bf09586d1b528c1d47182fe63cb84341ac0751 /tools | |
| parent | c76a31d1f6b70257085780dc1033a5eb04af93a6 (diff) | |
| download | chromium_src-933df47c743604207d9d0836dff94a20eddd24f6.zip chromium_src-933df47c743604207d9d0836dff94a20eddd24f6.tar.gz chromium_src-933df47c743604207d9d0836dff94a20eddd24f6.tar.bz2 | |
Telemetry: only whine about missing archives for pages which are really ran.
This is needed for the upcoming change which makes Telemetry to just fail if
archives are missing, unless a specific command line flag is passed. (It
prevents running against live sites by accident.)
BUG=173436
R=nduca
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/12334116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/telemetry/telemetry/page/page_runner.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py index 0074d79..6f0f0ef 100644 --- a/tools/telemetry/telemetry/page/page_runner.py +++ b/tools/telemetry/telemetry/page/page_runner.py @@ -67,8 +67,11 @@ class PageRunner(object): self.Close() def Run(self, options, possible_browser, test, results): + # Reorder page set based on options. + pages = _ShuffleAndFilterPageSet(self.page_set, options) + # Check if we can run against WPR. - for page in self.page_set.pages: + for page in pages: parsed_url = urlparse.urlparse(page.url) if parsed_url.scheme == 'file': continue @@ -100,7 +103,7 @@ class PageRunner(object): if self.page_set.user_agent_type: options.browser_user_agent_type = self.page_set.user_agent_type - for page in self.page_set: + for page in pages: test.CustomizeBrowserOptionsForPage(page, possible_browser.options) # Check tracing directory. @@ -113,9 +116,6 @@ class PageRunner(object): elif os.listdir(options.trace_dir): raise Exception('Trace directory isn\'t empty: %s' % options.trace_dir) - # Reorder page set based on options. - pages = _ShuffleAndFilterPageSet(self.page_set, options) - state = _RunState() last_archive_path = None try: |