[telemetry] Re-enable testGotQueryParams.

Most of that flow has been rewritten since it was disabled, so assume it's safe to re-enable. The trybot will run the test.
Also change the tests to raise MeasurementFailures, since we keep track of failures and errors separately.


BUG=288631
TEST=Mac trybot

Review URL: https://codereview.chromium.org/83003006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238265 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 6 deletions

diff --git a/tools/telemetry/telemetry/page/page_measurement_unittest.py b/tools/telemetry/telemetry/page/page_measurement_unittest.py
index 3228263..01fdb0f 100644
--- a/tools/telemetry/telemetry/page/page_measurement_unittest.py
+++ b/tools/telemetry/telemetry/page/page_measurement_unittest.py
@@ -23,13 +23,19 @@ class MeasurementThatHasDefaults(page_measurement.PageMeasurement):
     parser.add_option('-x', dest='x', default=3)
 
   def MeasurePage(self, page, tab, results):
-    assert self.options.x == 3
+    if not hasattr(self.options, 'x'):
+      raise page_measurement.MeasurementFailure('Default option was not set.')
+    if self.options.x != 3:
+      raise page_measurement.MeasurementFailure(
+          'Expected x == 3, got x == ' + self.options.x)
     results.Add('x', 'ms', 7)
 
 class MeasurementForBlank(page_measurement.PageMeasurement):
   def MeasurePage(self, page, tab, results):
     contents = tab.EvaluateJavaScript('document.body.textContent')
-    assert contents.strip() == 'Hello world'
+    if contents.strip() != 'Hello world':
+      raise page_measurement.MeasurementFailure(
+          'Page contents were: ' + contents)
 
 class MeasurementForReplay(page_measurement.PageMeasurement):
   def MeasurePage(self, page, tab, results):
@@ -41,7 +47,10 @@ class MeasurementForReplay(page_measurement.PageMeasurement):
 class MeasurementQueryParams(page_measurement.PageMeasurement):
   def MeasurePage(self, page, tab, results):
     query = tab.EvaluateJavaScript('window.location.search')
-    assert query.strip() == '?foo=1'
+    expected = '?foo=1'
+    if query.strip() != expected:
+      raise page_measurement.MeasurementFailure(
+          'query was %s, not %s.' % (query, expected))
 
 class MeasurementWithAction(page_measurement.PageMeasurement):
   def __init__(self):
@@ -63,11 +72,9 @@ class PageMeasurementUnitTest(
     all_results = self.RunMeasurement(measurement, ps, options=self._options)
     self.assertEquals(0, len(all_results.failures))
 
-  def disabled_testGotQueryParams(self):
-    # Disabled due to http://crbug.com/288631
+  def testGotQueryParams(self):
     ps = self.CreatePageSet('file://blank.html?foo=1')
     measurement = MeasurementQueryParams()
-    ps.pages[-1].query_params = '?foo=1'
     all_results = self.RunMeasurement(measurement, ps, options=self._options)
     self.assertEquals(0, len(all_results.failures))