summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornednguyen <nednguyen@google.com>2015-01-01 16:40:32 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-02 00:41:11 +0000
commitbed2c854e8c3f55373ebd95aea4238a80a73eaa5 (patch)
tree3f36b8efbb2068ffe489fe49f85568b5ec1ca203
parent26d649a0a739447a44a58ea65cbae4821c6465e5 (diff)
downloadchromium_src-bed2c854e8c3f55373ebd95aea4238a80a73eaa5.zip
chromium_src-bed2c854e8c3f55373ebd95aea4238a80a73eaa5.tar.gz
chromium_src-bed2c854e8c3f55373ebd95aea4238a80a73eaa5.tar.bz2
[Telemetry] Switch empty action_name_to_run to 'RunPageInteractions' for 4 measurements:
+ ImageDecoding measurement: This measurement is only paired with ImageDecodingMeasurementPageSet, which contains pages with default RunPageInteractions which does nothing. + MemoryMultiTab measurement: This measurement is not used by any benchmark. Though there are ToughMemoryMultiTabPageSet which contains pages with default RunPageInteractions which does nothing. +PolymerLoadMeasurement measurement: This measurement is paired with PicaPageSet & TopekaPageSet, both contain only pages with default RunPageInteractions which does nothing. +RecordPerArea measurement: This measurement is not used by any benchmark BUG=418375 Review URL: https://codereview.chromium.org/804303003 Cr-Commit-Position: refs/heads/master@{#309832}
-rw-r--r--tools/perf/measurements/image_decoding.py3
-rw-r--r--tools/perf/measurements/memory_multi_tab.py5
-rw-r--r--tools/perf/measurements/polymer_load.py4
-rw-r--r--tools/perf/measurements/record_per_area.py2
-rw-r--r--tools/telemetry/telemetry/page/__init__.py9
5 files changed, 19 insertions, 4 deletions
diff --git a/tools/perf/measurements/image_decoding.py b/tools/perf/measurements/image_decoding.py
index f360853..eed4ce9 100644
--- a/tools/perf/measurements/image_decoding.py
+++ b/tools/perf/measurements/image_decoding.py
@@ -13,7 +13,8 @@ from telemetry.value import scalar
class ImageDecoding(page_test.PageTest):
def __init__(self):
- super(ImageDecoding, self).__init__()
+ super(ImageDecoding, self).__init__(
+ action_name_to_run='RunPageInteractions')
self._power_metric = None
def CustomizeBrowserOptions(self, options):
diff --git a/tools/perf/measurements/memory_multi_tab.py b/tools/perf/measurements/memory_multi_tab.py
index e689151..2d344cd 100644
--- a/tools/perf/measurements/memory_multi_tab.py
+++ b/tools/perf/measurements/memory_multi_tab.py
@@ -13,8 +13,9 @@ from metrics import memory
from telemetry.page import page_test
class MemoryMultiTab(page_test.PageTest):
- def __init__(self, *args, **kwargs):
- super(MemoryMultiTab, self).__init__(*args, **kwargs)
+ def __init__(self):
+ super(MemoryMultiTab, self).__init__(
+ action_name_to_run='RunPageInteractions')
self._memory_metric = None
# _first_tab is used to make memory measurements
self._first_tab = None
diff --git a/tools/perf/measurements/polymer_load.py b/tools/perf/measurements/polymer_load.py
index a373a4f..9120e31 100644
--- a/tools/perf/measurements/polymer_load.py
+++ b/tools/perf/measurements/polymer_load.py
@@ -29,6 +29,10 @@ class PageForPolymerLoad(page.Page):
class PolymerLoadMeasurement(page_test.PageTest):
+ def __init__(self):
+ super(PolymerLoadMeasurement, self).__init__(
+ action_name_to_run='RunPageInteractions')
+
def ValidateAndMeasurePage(self, _, tab, results):
result = int(tab.EvaluateJavaScript('__polymer_ready_time'))
results.AddValue(scalar.ScalarValue(
diff --git a/tools/perf/measurements/record_per_area.py b/tools/perf/measurements/record_per_area.py
index cb89e11..3de7c70 100644
--- a/tools/perf/measurements/record_per_area.py
+++ b/tools/perf/measurements/record_per_area.py
@@ -11,7 +11,7 @@ from telemetry.value import scalar
class RecordPerArea(page_test.PageTest):
def __init__(self, start_wait_time=2):
- super(RecordPerArea, self).__init__('', True)
+ super(RecordPerArea, self).__init__('RunPageInteractions', True)
self._start_wait_time = start_wait_time
def CustomizeBrowserOptions(self, options):
diff --git a/tools/telemetry/telemetry/page/__init__.py b/tools/telemetry/telemetry/page/__init__.py
index 34a41d4..e9b8972 100644
--- a/tools/telemetry/telemetry/page/__init__.py
+++ b/tools/telemetry/telemetry/page/__init__.py
@@ -98,6 +98,15 @@ class Page(user_story.UserStory):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
+ def RunPageInteractions(self, action_runner):
+ """Override this to define custom interactions with the page.
+ e.g:
+ def RunPageInteractions(self, action_runner):
+ action_runner.ScrollPage()
+ action_runner.TapElement(text='Next')
+ """
+ pass
+
def CanRunOnBrowser(self, browser_info):
"""Override this to returns whether this page can be run on specific
browser.