Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(518)

Unified Diff: tools/telemetry/telemetry/page/page_measurement_unittest_base.py

Issue 16158006: Defining the test expectations object (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/telemetry/telemetry/page/page_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/page/page_measurement_unittest_base.py
diff --git a/tools/telemetry/telemetry/page/page_measurement_unittest_base.py b/tools/telemetry/telemetry/page/page_measurement_unittest_base.py
index bf882239a0a84f4efa71db0fa361ff390cee4973..6c570c84237f2b52e6a22f30b624256135a20714 100644
--- a/tools/telemetry/telemetry/page/page_measurement_unittest_base.py
+++ b/tools/telemetry/telemetry/page/page_measurement_unittest_base.py
@@ -7,6 +7,7 @@ import unittest
from telemetry.page import page_runner
from telemetry.page import page as page_module
from telemetry.page import page_set
+from telemetry.page import test_expectations
from telemetry.unittest import options_for_unittests
class PageMeasurementUnitTestBase(unittest.TestCase):
@@ -25,7 +26,9 @@ class PageMeasurementUnitTestBase(unittest.TestCase):
ps.pages.append(page)
return ps
- def RunMeasurement(self, measurement, ps, options=None):
+ def RunMeasurement(self, measurement, ps,
+ expectations=test_expectations.TestExpectations(),
+ options=None):
"""Runs a measurement against a pageset, returning the rows its outputs."""
if options is None:
options = options_for_unittests.GetCopy()
@@ -42,4 +45,4 @@ class PageMeasurementUnitTestBase(unittest.TestCase):
options.output_file = None
options.output_format = 'none'
options.output_trace_tag = None
- return page_runner.Run(measurement, ps, options)
+ return page_runner.Run(measurement, ps, expectations, options)
« no previous file with comments | « no previous file | tools/telemetry/telemetry/page/page_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698