Index: tools/perf/benchmarks/peacekeeper.py |
diff --git a/tools/perf/benchmarks/peacekeeper.py b/tools/perf/benchmarks/peacekeeper.py |
index 57b7e62e5e109b68fdbd693940ea27665bfaea1d..677973baac930519def1833362f6fe4fdd0f76f8 100644 |
--- a/tools/perf/benchmarks/peacekeeper.py |
+++ b/tools/perf/benchmarks/peacekeeper.py |
@@ -14,15 +14,15 @@ second depending on the test. Final Score is computed by calculating geometric |
mean of individual tests scores. |
""" |
+from measurements import PageTestMeasurement |
from telemetry import benchmark |
from telemetry.page import page_set |
-from telemetry.page import page_test |
from telemetry.util import statistics |
from telemetry.value import merge_values |
from telemetry.value import scalar |
-class _PeaceKeeperMeasurement(page_test.PageTest): |
+class _PeaceKeeperMeasurement(PageTestMeasurement): |
def WillNavigateToPage(self, page, tab): |
page.script_to_evaluate_on_commit = """ |
@@ -51,13 +51,15 @@ class _PeaceKeeperMeasurement(page_test.PageTest): |
} |
""" |
- def ValidateAndMeasurePage(self, _, tab, results): |
+ def ValidateAndMeasurePage(self, page, tab, results): |
tab.WaitForJavaScriptExpression('_done', 600) |
result = tab.EvaluateJavaScript('__results') |
results.AddValue(scalar.ScalarValue( |
results.current_page, '%s.Score' % result['test'], 'score', |
int(result['score'])), important=False) |
+ super(_PeaceKeeperMeasurement, self).ValidateAndMeasurePage( |
+ page, tab, results) |
def DidRunTest(self, browser, results): |
# Calculate geometric mean as the total for the combined tests. |