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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/perf/page_sets/top_25.py

Issue 321563003: Add Wait* API to ActionRunner to wrap over WaitAction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/perf/page_sets/top_10.py ('k') | tools/perf/page_sets/top_desktop_sites_2012Q3.py » ('j') | tools/telemetry/telemetry/page/actions/action_runner.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/page_sets/top_25.py
diff --git a/tools/perf/page_sets/top_25.py b/tools/perf/page_sets/top_25.py
index 3b615c6a750ed1dbf29e781fb6ee648e5ac0d35d..15d3e445303224ea746096acc11e409a6c7b639d 100644
--- a/tools/perf/page_sets/top_25.py
+++ b/tools/perf/page_sets/top_25.py
@@ -36,11 +36,7 @@ class GoogleWebSearchPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Next',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Next')
def RunStressMemory(self, action_runner):
action_runner.RunAction(ScrollAction())
@@ -51,11 +47,7 @@ class GoogleWebSearchPage(Top25Page):
'condition': 'href_change'
}
}))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Next',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Next')
action_runner.RunAction(ScrollAction())
action_runner.RunAction(ClickElementAction(
{
@@ -64,11 +56,7 @@ class GoogleWebSearchPage(Top25Page):
'condition': 'href_change'
}
}))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Next',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Next')
action_runner.RunAction(ScrollAction())
action_runner.RunAction(ClickElementAction(
{
@@ -77,11 +65,7 @@ class GoogleWebSearchPage(Top25Page):
'condition': 'href_change'
}
}))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Previous',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Previous')
action_runner.RunAction(ScrollAction())
action_runner.RunAction(ClickElementAction(
{
@@ -90,11 +74,7 @@ class GoogleWebSearchPage(Top25Page):
'condition': 'href_change'
}
}))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Previous',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Previous')
action_runner.RunAction(ScrollAction())
action_runner.RunAction(ClickElementAction(
{
@@ -103,11 +83,7 @@ class GoogleWebSearchPage(Top25Page):
'condition': 'href_change'
}
}))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Previous',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Previous')
action_runner.RunAction(ScrollAction())
action_runner.RunAction(ClickElementAction(
{
@@ -116,11 +92,7 @@ class GoogleWebSearchPage(Top25Page):
'condition': 'href_change'
}
}))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Images',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Images')
action_runner.RunAction(ScrollAction())
action_runner.RunAction(ClickElementAction(
{
@@ -129,11 +101,7 @@ class GoogleWebSearchPage(Top25Page):
'condition': 'href_change'
}
}))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Images',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Images')
class GmailPage(Top25Page):
@@ -149,11 +117,9 @@ class GmailPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'javascript': ('window.gmonkey !== undefined &&'
- 'document.getElementById("gb") !== null')
- }))
+ action_runner.WaitForJavaScriptCondition(
+ 'window.gmonkey !== undefined &&'
+ 'document.getElementById("gb") !== null')
def RunStressMemory(self, action_runner):
action_runner.RunAction(ClickElementAction(
@@ -196,15 +162,8 @@ class GoogleCalendarPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navForward"]'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement('div[class~="navForward"]')
action_runner.ExecuteJavaScript('''
(function() {
var elem = document.createElement('meta');
@@ -212,116 +171,57 @@ class GoogleCalendarPage(Top25Page):
elem.content='initial-scale=1';
document.body.appendChild(elem);
})();''')
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 1
- }))
+ action_runner.Wait(1)
def RunStressMemory(self, action_runner):
action_runner.RunAction(ClickElementAction(
{
'selector': 'div[class~="navForward"]'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navForward"]'
- }))
+ action_runner.WaitAction(2)
+ action_runner.WaitForElement('div[class~="navForward"]')
action_runner.RunAction(ClickElementAction(
{
'selector': 'div[class~="navForward"]'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navForward"]'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement('div[class~="navForward"]')
action_runner.RunAction(ClickElementAction(
{
'selector': 'div[class~="navForward"]'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navForward"]'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement('div[class~="navForward"]')
action_runner.RunAction(ClickElementAction(
{
'selector': 'div[class~="navForward"]'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navBack"]'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement('div[class~="navBack"]')
action_runner.RunAction(ClickElementAction(
{
'selector': 'div[class~="navBack"]'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navBack"]'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement('div[class~="navBack"]')
action_runner.RunAction(ClickElementAction(
{
'selector': 'div[class~="navBack"]'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navBack"]'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement('div[class~="navBack"]')
action_runner.RunAction(ClickElementAction(
{
'selector': 'div[class~="navBack"]'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navBack"]'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement('div[class~="navBack"]')
action_runner.RunAction(ClickElementAction(
{
'selector': 'div[class~="navBack"]'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector': 'div[class~="navBack"]'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement('div[class~="navBack"]')
def RunSmoothness(self, action_runner):
action_runner.RunAction(ScrollAction(
@@ -360,15 +260,9 @@ class GoogleDocPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'javascript':
- 'document.getElementsByClassName("kix-appview-editor").length'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForJavaScriptCondition(
+ 'document.getElementsByClassName("kix-appview-editor").length')
def RunSmoothness(self, action_runner):
action_runner.RunAction(ScrollAction(
@@ -393,78 +287,39 @@ class GooglePlusPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Home',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='Home')
def RunStressMemory(self, action_runner):
action_runner.RunAction(ClickElementAction(
{
'text' : 'Home'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Profile',
- 'condition': 'element'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement(contains_text='Profile')
action_runner.RunAction(ClickElementAction(
{
'text' : 'Profile'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Explore',
- 'condition': 'element'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement(contains_text='Explore')
action_runner.RunAction(ClickElementAction(
{
'text' : 'Explore'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Events',
- 'condition': 'element'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement(contains_text='Events')
action_runner.RunAction(ClickElementAction(
{
'text' : 'Events'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Communities',
- 'condition': 'element'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement(contains_text='Communities')
action_runner.RunAction(ClickElementAction(
{
'text' : 'Communities'
}))
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'Home',
- 'condition': 'element'
- }))
+ action_runner.Wait(2)
+ action_runner.WaitForElement(contains_text='Home')
def RunSmoothness(self, action_runner):
action_runner.RunAction(ScrollAction(
@@ -486,10 +341,7 @@ class YoutubePage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
+ action_runner.Wait(2)
class BlogspotPage(Top25Page):
@@ -505,11 +357,7 @@ class BlogspotPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'accessibility',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='accessibility')
def RunStressMemory(self, action_runner):
action_runner.RunAction(ClickElementAction(
@@ -558,13 +406,9 @@ class WordpressPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'condition': 'element',
- 'selector':
- # pylint: disable=C0301
- 'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]'
- }))
+ action_runner.WaitForElement(
+ # pylint: disable=C0301
+ 'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]')
def RunStressMemory(self, action_runner):
action_runner.RunAction(ScrollAction())
@@ -609,11 +453,7 @@ class FacebookPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'text' : 'About',
- 'condition': 'element'
- }))
+ action_runner.WaitForElement(contains_text='About')
def RunStressMemory(self, action_runner):
action_runner.RunAction(ClickElementAction(
@@ -700,10 +540,7 @@ class TwitterPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
+ action_runner.Wait(2)
def RunSmoothness(self, action_runner):
action_runner.RunAction(ScrollAction(
@@ -769,10 +606,7 @@ class YahooGamesPage(Top25Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
- action_runner.RunAction(WaitAction(
- {
- 'seconds': 2
- }))
+ action_runner.Wait(2)
class Top25PageSet(page_set_module.PageSet):
« no previous file with comments | « tools/perf/page_sets/top_10.py ('k') | tools/perf/page_sets/top_desktop_sites_2012Q3.py » ('j') | tools/telemetry/telemetry/page/actions/action_runner.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698