Index: tools/telemetry/docs/telemetry.page.page_measurement_unittest_base.html |
diff --git a/tools/telemetry/docs/telemetry.page.page_measurement_unittest_base.html b/tools/telemetry/docs/telemetry.page.page_measurement_unittest_base.html |
index 6f8dbbd2785278a9215531f2c6eeb1cb3c5ee8f7..0194a49b4afc5213f961830d05d64119d48cf88d 100644 |
--- a/tools/telemetry/docs/telemetry.page.page_measurement_unittest_base.html |
+++ b/tools/telemetry/docs/telemetry.page.page_measurement_unittest_base.html |
@@ -20,12 +20,13 @@ |
<tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td> |
<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="telemetry.unittest.options_for_unittests.html">telemetry.unittest.options_for_unittests</a><br> |
-<a href="os.html">os</a><br> |
-</td><td width="25%" valign=top><a href="telemetry.page.page.html">telemetry.page.page</a><br> |
-<a href="telemetry.page.page_runner.html">telemetry.page.page_runner</a><br> |
-</td><td width="25%" valign=top><a href="telemetry.page.page_set.html">telemetry.page.page_set</a><br> |
+<a href="telemetry.page.page.html">telemetry.page.page</a><br> |
+</td><td width="25%" valign=top><a href="telemetry.page.page_runner.html">telemetry.page.page_runner</a><br> |
+<a href="telemetry.page.page_set.html">telemetry.page.page_set</a><br> |
+</td><td width="25%" valign=top><a href="telemetry.page.test_expectations.html">telemetry.page.test_expectations</a><br> |
<a href="unittest.html">unittest</a><br> |
-</td><td width="25%" valign=top></td></tr></table></td></tr></table><p> |
+</td><td width="25%" valign=top><a href="telemetry.core.util.html">telemetry.core.util</a><br> |
+</td></tr></table></td></tr></table><p> |
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> |
<tr bgcolor="#ee77aa"> |
<td colspan=3 valign=bottom> <br> |
@@ -61,7 +62,7 @@ Methods defined here:<br> |
<dl><dt><a name="PageMeasurementUnitTestBase-CreatePageSetFromFileInUnittestDataDir"><strong>CreatePageSetFromFileInUnittestDataDir</strong></a>(self, test_filename)</dt></dl> |
-<dl><dt><a name="PageMeasurementUnitTestBase-RunMeasurement"><strong>RunMeasurement</strong></a>(self, measurement, ps, options<font color="#909090">=None</font>)</dt><dd><tt>Runs a measurement against a pageset, returning the rows its outputs.</tt></dd></dl> |
+<dl><dt><a name="PageMeasurementUnitTestBase-RunMeasurement"><strong>RunMeasurement</strong></a>(self, measurement, ps, expectations<font color="#909090">=<telemetry.page.test_expectations.TestExpectations object></font>, options<font color="#909090">=None</font>)</dt><dd><tt>Runs a measurement against a pageset, returning the rows its outputs.</tt></dd></dl> |
<hr> |
Methods inherited from <a href="unittest.case.html#TestCase">unittest.case.TestCase</a>:<br> |
@@ -196,10 +197,10 @@ as significant digits (measured from the most  |
<br> |
Objects that are equal automatically fail.</tt></dd></dl> |
-<dl><dt><a name="PageMeasurementUnitTestBase-assertNotEqual"><strong>assertNotEqual</strong></a>(self, first, second, msg<font color="#909090">=None</font>)</dt><dd><tt>Fail if the two objects are equal as determined by the '=='<br> |
+<dl><dt><a name="PageMeasurementUnitTestBase-assertNotEqual"><strong>assertNotEqual</strong></a>(self, first, second, msg<font color="#909090">=None</font>)</dt><dd><tt>Fail if the two objects are equal as determined by the '!='<br> |
operator.</tt></dd></dl> |
-<dl><dt><a name="PageMeasurementUnitTestBase-assertNotEquals"><strong>assertNotEquals</strong></a> = assertNotEqual(self, first, second, msg<font color="#909090">=None</font>)</dt><dd><tt>Fail if the two objects are equal as determined by the '=='<br> |
+<dl><dt><a name="PageMeasurementUnitTestBase-assertNotEquals"><strong>assertNotEquals</strong></a> = assertNotEqual(self, first, second, msg<font color="#909090">=None</font>)</dt><dd><tt>Fail if the two objects are equal as determined by the '!='<br> |
operator.</tt></dd></dl> |
<dl><dt><a name="PageMeasurementUnitTestBase-assertNotIn"><strong>assertNotIn</strong></a>(self, member, container, msg<font color="#909090">=None</font>)</dt><dd><tt>Just like <a href="#PageMeasurementUnitTestBase-assertTrue">assertTrue</a>(a not in b), but with a nicer default message.</tt></dd></dl> |
@@ -208,10 +209,10 @@ operator.</tt></dd></dl> |
<dl><dt><a name="PageMeasurementUnitTestBase-assertNotRegexpMatches"><strong>assertNotRegexpMatches</strong></a>(self, text, unexpected_regexp, msg<font color="#909090">=None</font>)</dt><dd><tt>Fail the test if the text matches the regular expression.</tt></dd></dl> |
-<dl><dt><a name="PageMeasurementUnitTestBase-assertRaises"><strong>assertRaises</strong></a>(self, excClass, callableObj<font color="#909090">=None</font>, *args, **kwargs)</dt><dd><tt>Fail unless an exception of class excClass is thrown<br> |
+<dl><dt><a name="PageMeasurementUnitTestBase-assertRaises"><strong>assertRaises</strong></a>(self, excClass, callableObj<font color="#909090">=None</font>, *args, **kwargs)</dt><dd><tt>Fail unless an exception of class excClass is raised<br> |
by callableObj when invoked with arguments args and keyword<br> |
arguments kwargs. If a different type of exception is<br> |
-thrown, it will not be caught, and the test case will be<br> |
+raised, it will not be caught, and the test case will be<br> |
deemed to have suffered an error, exactly as for an<br> |
unexpected exception.<br> |
<br> |