diff options
author | nednguyen <nednguyen@google.com> | 2015-01-05 08:24:46 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-05 16:25:24 +0000 |
commit | 11260052ca106f87b608caac6bc0f6f2bc589375 (patch) | |
tree | 22fe3c6b3d9c5c0dff898c23b0a9f6f37f23e561 /tools/perf/benchmarks | |
parent | c3178ac3bfb94382a9e87414769fd993eaa198a2 (diff) | |
download | chromium_src-11260052ca106f87b608caac6bc0f6f2bc589375.zip chromium_src-11260052ca106f87b608caac6bc0f6f2bc589375.tar.gz chromium_src-11260052ca106f87b608caac6bc0f6f2bc589375.tar.bz2 |
[Telemetry] Convert empty action_name_to_run to 'RunPageInteractions' for a
variety of perf measurement.
These measurements are only paired with default pages, or custom pages
without RunPageInteractions defined. Hence, the RunPageInteractions is used
which does nothing.
BUG=
Review URL: https://codereview.chromium.org/808883003
Cr-Commit-Position: refs/heads/master@{#309914}
Diffstat (limited to 'tools/perf/benchmarks')
-rw-r--r-- | tools/perf/benchmarks/blink_perf.py | 3 | ||||
-rw-r--r-- | tools/perf/benchmarks/dom_perf.py | 4 | ||||
-rw-r--r-- | tools/perf/benchmarks/dromaeo.py | 3 | ||||
-rw-r--r-- | tools/perf/benchmarks/indexeddb_perf.py | 5 | ||||
-rw-r--r-- | tools/perf/benchmarks/jetstream.py | 3 | ||||
-rw-r--r-- | tools/perf/benchmarks/kraken.py | 3 | ||||
-rw-r--r-- | tools/perf/benchmarks/maps.py | 4 | ||||
-rw-r--r-- | tools/perf/benchmarks/media.py | 4 | ||||
-rw-r--r-- | tools/perf/benchmarks/octane.py | 3 | ||||
-rw-r--r-- | tools/perf/benchmarks/robohornet_pro.py | 3 | ||||
-rw-r--r-- | tools/perf/benchmarks/service_worker.py | 11 | ||||
-rw-r--r-- | tools/perf/benchmarks/spaceport.py | 3 | ||||
-rw-r--r-- | tools/perf/benchmarks/speedometer.py | 4 | ||||
-rw-r--r-- | tools/perf/benchmarks/sunspider.py | 3 |
14 files changed, 41 insertions, 15 deletions
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py index f6fa81c..038ebb4 100644 --- a/tools/perf/benchmarks/blink_perf.py +++ b/tools/perf/benchmarks/blink_perf.py @@ -64,7 +64,8 @@ def CreatePageSetFromPath(path, skipped_file): class _BlinkPerfMeasurement(page_test.PageTest): """Tuns a blink performance test and reports the results.""" def __init__(self): - super(_BlinkPerfMeasurement, self).__init__('') + super(_BlinkPerfMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') with open(os.path.join(os.path.dirname(__file__), 'blink_perf.js'), 'r') as f: self._blink_perf_js = f.read() diff --git a/tools/perf/benchmarks/dom_perf.py b/tools/perf/benchmarks/dom_perf.py index af779b0..87c0bcb 100644 --- a/tools/perf/benchmarks/dom_perf.py +++ b/tools/perf/benchmarks/dom_perf.py @@ -39,6 +39,10 @@ SCORE_TRACE_NAME = 'score' class _DomPerfMeasurement(page_test.PageTest): + def __init__(self): + super(_DomPerfMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') + def ValidateAndMeasurePage(self, page, tab, results): try: def _IsDone(): diff --git a/tools/perf/benchmarks/dromaeo.py b/tools/perf/benchmarks/dromaeo.py index f0bd8d0..1f32d39 100644 --- a/tools/perf/benchmarks/dromaeo.py +++ b/tools/perf/benchmarks/dromaeo.py @@ -15,7 +15,8 @@ from telemetry.value import scalar class _DromaeoMeasurement(page_test.PageTest): def __init__(self): - super(_DromaeoMeasurement, self).__init__() + super(_DromaeoMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') self._power_metric = None def CustomizeBrowserOptions(self, options): diff --git a/tools/perf/benchmarks/indexeddb_perf.py b/tools/perf/benchmarks/indexeddb_perf.py index d6344df..e79c2ff 100644 --- a/tools/perf/benchmarks/indexeddb_perf.py +++ b/tools/perf/benchmarks/indexeddb_perf.py @@ -37,8 +37,9 @@ _V8_COUNTER_NAMES = [ ] class _IndexedDbMeasurement(page_test.PageTest): - def __init__(self, *args, **kwargs): - super(_IndexedDbMeasurement, self).__init__(*args, **kwargs) + def __init__(self): + super(_IndexedDbMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') self._memory_metric = None self._power_metric = None self._v8_object_stats_metric = None diff --git a/tools/perf/benchmarks/jetstream.py b/tools/perf/benchmarks/jetstream.py index fffa23a..32b99f3 100644 --- a/tools/perf/benchmarks/jetstream.py +++ b/tools/perf/benchmarks/jetstream.py @@ -30,7 +30,8 @@ from telemetry.value import list_of_scalar_values class _JetstreamMeasurement(page_test.PageTest): def __init__(self): - super(_JetstreamMeasurement, self).__init__() + super(_JetstreamMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') def WillNavigateToPage(self, page, tab): page.script_to_evaluate_on_commit = """ diff --git a/tools/perf/benchmarks/kraken.py b/tools/perf/benchmarks/kraken.py index a2ef567..de3bfcf 100644 --- a/tools/perf/benchmarks/kraken.py +++ b/tools/perf/benchmarks/kraken.py @@ -68,7 +68,8 @@ def _Mean(l): class _KrakenMeasurement(page_test.PageTest): def __init__(self): - super(_KrakenMeasurement, self).__init__() + super(_KrakenMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') self._power_metric = None def CustomizeBrowserOptions(self, options): diff --git a/tools/perf/benchmarks/maps.py b/tools/perf/benchmarks/maps.py index 85f8053..be36d72 100644 --- a/tools/perf/benchmarks/maps.py +++ b/tools/perf/benchmarks/maps.py @@ -17,6 +17,10 @@ from telemetry.value import scalar class _MapsMeasurement(page_test.PageTest): + def __init__(self): + super(_MapsMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') + def ValidateAndMeasurePage(self, page, tab, results): js_get_results = 'document.getElementsByTagName("pre")[0].innerText' test_results = tab.EvaluateJavaScript(js_get_results) diff --git a/tools/perf/benchmarks/media.py b/tools/perf/benchmarks/media.py index 820fa37..a45fd5d 100644 --- a/tools/perf/benchmarks/media.py +++ b/tools/perf/benchmarks/media.py @@ -11,6 +11,10 @@ from telemetry.value import scalar class _MSEMeasurement(page_test.PageTest): + def __init__(self): + super(_MSEMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') + def ValidateAndMeasurePage(self, page, tab, results): media_metric = tab.EvaluateJavaScript('window.__testMetrics') trace = media_metric['id'] if 'id' in media_metric else None diff --git a/tools/perf/benchmarks/octane.py b/tools/perf/benchmarks/octane.py index 8f1869b..4fdecae 100644 --- a/tools/perf/benchmarks/octane.py +++ b/tools/perf/benchmarks/octane.py @@ -67,7 +67,8 @@ DESCRIPTIONS = { class _OctaneMeasurement(page_test.PageTest): def __init__(self): - super(_OctaneMeasurement, self).__init__() + super(_OctaneMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') self._power_metric = None def CustomizeBrowserOptions(self, options): diff --git a/tools/perf/benchmarks/robohornet_pro.py b/tools/perf/benchmarks/robohornet_pro.py index 11e40b8..d990f9f 100644 --- a/tools/perf/benchmarks/robohornet_pro.py +++ b/tools/perf/benchmarks/robohornet_pro.py @@ -16,7 +16,8 @@ from telemetry.value import scalar class _RobohornetProMeasurement(page_test.PageTest): def __init__(self): - super(_RobohornetProMeasurement, self).__init__() + super(_RobohornetProMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') self._power_metric = None def CustomizeBrowserOptions(self, options): diff --git a/tools/perf/benchmarks/service_worker.py b/tools/perf/benchmarks/service_worker.py index 7b4f62e..6fbdc10 100644 --- a/tools/perf/benchmarks/service_worker.py +++ b/tools/perf/benchmarks/service_worker.py @@ -85,8 +85,9 @@ class _ServiceWorkerTimelineMetric(object): class _ServiceWorkerMeasurement(page_test.PageTest): """Measure Speed Index and TRACE_EVENTs""" - def __init__(self, *args, **kwargs): - super(_ServiceWorkerMeasurement, self).__init__(*args, **kwargs) + def __init__(self): + super(_ServiceWorkerMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') self._timeline_controller = timeline_controller.TimelineController() self._speed_index = speedindex.SpeedIndexMetric() self._page_open_times = collections.defaultdict(int) @@ -137,9 +138,9 @@ class _ServiceWorkerMeasurement(page_test.PageTest): class _ServiceWorkerMicroBenchmarkMeasurement(page_test.PageTest): """Measure JS land values and TRACE_EVENTs""" - def __init__(self, *args, **kwargs): - super(_ServiceWorkerMicroBenchmarkMeasurement, self).__init__(*args, - **kwargs) + def __init__(self): + super(_ServiceWorkerMicroBenchmarkMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') self._timeline_controller = timeline_controller.TimelineController() def CustomizeBrowserOptions(self, options): diff --git a/tools/perf/benchmarks/spaceport.py b/tools/perf/benchmarks/spaceport.py index cd1fbc6..5837a06 100644 --- a/tools/perf/benchmarks/spaceport.py +++ b/tools/perf/benchmarks/spaceport.py @@ -49,7 +49,8 @@ DESCRIPTIONS = { class _SpaceportMeasurement(page_test.PageTest): def __init__(self): - super(_SpaceportMeasurement, self).__init__() + super(_SpaceportMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') def CustomizeBrowserOptions(self, options): options.AppendExtraBrowserArgs('--disable-gpu-vsync') diff --git a/tools/perf/benchmarks/speedometer.py b/tools/perf/benchmarks/speedometer.py index 96ca66b..edcc2f1 100644 --- a/tools/perf/benchmarks/speedometer.py +++ b/tools/perf/benchmarks/speedometer.py @@ -36,6 +36,10 @@ class SpeedometerMeasurement(page_test.PageTest): 'FlightJS-TodoMVC' ] + def __init__(self): + super(SpeedometerMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') + def ValidateAndMeasurePage(self, page, tab, results): tab.WaitForDocumentReadyStateToBeComplete() iterationCount = 10 diff --git a/tools/perf/benchmarks/sunspider.py b/tools/perf/benchmarks/sunspider.py index 18d2916..5db0cb6 100644 --- a/tools/perf/benchmarks/sunspider.py +++ b/tools/perf/benchmarks/sunspider.py @@ -75,7 +75,8 @@ DESCRIPTIONS = { class _SunspiderMeasurement(page_test.PageTest): def __init__(self): - super(_SunspiderMeasurement, self).__init__() + super(_SunspiderMeasurement, self).__init__( + action_name_to_run='RunPageInteractions') self._power_metric = None def CustomizeBrowserOptions(self, options): |