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

Side by Side Diff: tools/perf/page_sets/google_pages.py

Issue 2618333006: [tools/perf] Fix JavaScript interpolation in action_runner calls (Closed)
Patch Set: fix a few more interpolations Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « tools/perf/page_sets/blob_workshop.py ('k') | tools/perf/page_sets/indexeddb_endure_page.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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 from page_sets.login_helpers import google_login 5 from page_sets.login_helpers import google_login
6 6
7 from telemetry.page import page as page_module 7 from telemetry.page import page as page_module
8 from telemetry.page import shared_page_state 8 from telemetry.page import shared_page_state
9 from telemetry.util import js_template
9 10
10 import os 11 import os
11 12
12 def _DeterministicPerformanceCounters(): 13 def _DeterministicPerformanceCounters():
13 with open(os.path.join(os.path.dirname(__file__), 14 with open(os.path.join(os.path.dirname(__file__),
14 'deterministic_performance_counters.js')) as f: 15 'deterministic_performance_counters.js')) as f:
15 return f.read() 16 return f.read()
16 17
17 class GooglePages(page_module.Page): 18 class GooglePages(page_module.Page):
18 def __init__(self, url, page_set, shared_page_state_class, 19 def __init__(self, url, page_set, shared_page_state_class,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 61
61 62
62 INTERACTION_NAME = 'Interaction.AppLoad' 63 INTERACTION_NAME = 'Interaction.AppLoad'
63 class AdwordCampaignDesktopPage(page_module.Page): 64 class AdwordCampaignDesktopPage(page_module.Page):
64 def __init__(self, page_set): 65 def __init__(self, page_set):
65 super(AdwordCampaignDesktopPage, self).__init__( 66 super(AdwordCampaignDesktopPage, self).__init__(
66 url='https://adwords.google.com/cm/CampaignMgmt', 67 url='https://adwords.google.com/cm/CampaignMgmt',
67 page_set=page_set, name='AdwordsCampaign', 68 page_set=page_set, name='AdwordsCampaign',
68 credentials_path='data/credentials.json', 69 credentials_path='data/credentials.json',
69 shared_page_state_class=shared_page_state.SharedDesktopPageState) 70 shared_page_state_class=shared_page_state.SharedDesktopPageState)
70 self.script_to_evaluate_on_commit = ( 71 self.script_to_evaluate_on_commit = js_template.Render(
71 'console.time("%s");' % INTERACTION_NAME) 72 'console.time({{ label }});', label=INTERACTION_NAME)
72 73
73 def RunNavigateSteps(self, action_runner): 74 def RunNavigateSteps(self, action_runner):
74 google_login.LoginGoogleAccount(action_runner, 'google3', 75 google_login.LoginGoogleAccount(action_runner, 'google3',
75 self.credentials_path) 76 self.credentials_path)
76 super(AdwordCampaignDesktopPage, self).RunNavigateSteps(action_runner) 77 super(AdwordCampaignDesktopPage, self).RunNavigateSteps(action_runner)
77 78
78 def RunPageInteractions(self, action_runner): 79 def RunPageInteractions(self, action_runner):
79 action_runner.WaitForElement(text='Welcome to AdWords!') 80 action_runner.WaitForElement(text='Welcome to AdWords!')
80 # TODO(catapult:#3028): Fix interpolation of JavaScript values. 81 action_runner.ExecuteJavaScript(
81 action_runner.ExecuteJavaScript('console.timeEnd("%s");' % INTERACTION_NAME) 82 'console.timeEnd({{ label }});', label=INTERACTION_NAME)
OLDNEW
« no previous file with comments | « tools/perf/page_sets/blob_workshop.py ('k') | tools/perf/page_sets/indexeddb_endure_page.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698