diff options
| author | dennisjeffrey@chromium.org <dennisjeffrey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 18:58:52 +0000 |
|---|---|---|
| committer | dennisjeffrey@chromium.org <dennisjeffrey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 18:58:52 +0000 |
| commit | e1e521acf08b459bf10c07c7f00c5c68dca0f608 (patch) | |
| tree | 871d495da611241c4dbeb9d7d0e7e60212825264 | |
| parent | 9e5239d69571f5e26883449cb76462bcd83bbd1d (diff) | |
| download | chromium_src-e1e521acf08b459bf10c07c7f00c5c68dca0f608.zip chromium_src-e1e521acf08b459bf10c07c7f00c5c68dca0f608.tar.gz chromium_src-e1e521acf08b459bf10c07c7f00c5c68dca0f608.tar.bz2 | |
Merge 113448 - Minor edits to perf.py to account for UI changes in Gmail/Calendar.
BUG=chromium-os:23871
TEST=None
Review URL: http://codereview.chromium.org/8858001
TBR=dennisjeffrey@chromium.org
Review URL: http://codereview.chromium.org/8893006
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@113827 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/test/functional/perf.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/test/functional/perf.py b/chrome/test/functional/perf.py index 7b32614..e75faba 100755 --- a/chrome/test/functional/perf.py +++ b/chrome/test/functional/perf.py @@ -488,15 +488,13 @@ class LiveWebappLoadTest(BasePerfTest): Timing starts right before the new tab is opened, and stops as soon as the webpage displays the calendar print button (title 'Print my calendar'). """ - EXPECTED_SUBSTRING = 'Print my calendar' + EXPECTED_SUBSTRING = 'Month' def _DivTitleStartsWith(): js = """ var divs = document.getElementsByTagName("div"); for (var i = 0; i < divs.length; ++i) { - if (divs[i].hasOwnProperty("dataset") && - divs[i].dataset.hasOwnProperty("tooltip") && - divs[i].dataset.tooltip.indexOf("%s") == 0) + if (divs[i].innerHTML == "%s") window.domAutomationController.send("true"); } window.domAutomationController.send("false"); @@ -1068,7 +1066,7 @@ class MemoryBloatTest(BasePerfTest): compose_button = wait.until(lambda _: _GetElement( driver.find_element_by_xpath, - '//div[text()="Compose mail"]')) + '//div[text()="COMPOSE"]')) compose_button.click() to_field = wait.until(lambda _: _GetElement( |