mean of individual tests scores.
"""
-from telemetry import test
-from telemetry.page import page_measurement
+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_measurement.PageMeasurement):
+
+class _PeaceKeeperMeasurement(page_test.PageTest):
def WillNavigateToPage(self, page, tab):
page.script_to_evaluate_on_commit = """
}
"""
- def MeasurePage(self, _, tab, results):
+ def ValidateAndMeasurePage(self, _, tab, results):
tab.WaitForJavaScriptExpression('_done', 600)
result = tab.EvaluateJavaScript('__results')
- results.Add('Score', 'score', int(result['score']), result['test'],
- 'unimportant')
+ results.AddValue(scalar.ScalarValue(
+ results.current_page, '%s.Score' % result['test'], 'score',
+ int(result['score'])), important=False)
def DidRunTest(self, browser, results):
# Calculate geometric mean as the total for the combined tests.
scalar.ScalarValue(None, 'Total.Score', 'score', total))
-class PeaceKeeperBenchmark(test.Test):
+@benchmark.Disabled
+class PeaceKeeperBenchmark(benchmark.Benchmark):
"""A base class for Peackeeper benchmarks."""
test = _PeaceKeeperMeasurement
return ps
+@benchmark.Disabled
class PeaceKeeperRender(PeaceKeeperBenchmark):
"""PeaceKeeper rendering benchmark suite.
]
+@benchmark.Disabled
class PeaceKeeperData(PeaceKeeperBenchmark):
"""PeaceKeeper Data operations benchmark suite.
]
+@benchmark.Disabled
class PeaceKeeperDom(PeaceKeeperBenchmark):
"""PeaceKeeper DOM operations benchmark suite.
]
+@benchmark.Disabled
class PeaceKeeperTextParsing(PeaceKeeperBenchmark):
"""PeaceKeeper Text Parsing benchmark suite.
]
+@benchmark.Disabled
class PeaceKeeperHTML5Canvas(PeaceKeeperBenchmark):
"""PeaceKeeper HTML5 Canvas benchmark suite.
]
+@benchmark.Disabled
class PeaceKeeperHTML5Capabilities(PeaceKeeperBenchmark):
"""PeaceKeeper HTML5 Capabilities benchmark suite.