Index: trunk/src/tools/telemetry/telemetry/results/page_measurement_results_unittest.py |
=================================================================== |
--- trunk/src/tools/telemetry/telemetry/results/page_measurement_results_unittest.py (revision 284496) |
+++ trunk/src/tools/telemetry/telemetry/results/page_measurement_results_unittest.py (working copy) |
@@ -7,7 +7,6 @@ |
from telemetry import perf_tests_helper |
from telemetry.page import page_set |
from telemetry.results import page_measurement_results |
-from telemetry.value import failure |
from telemetry.value import histogram |
from telemetry.value import scalar |
@@ -113,12 +112,12 @@ |
results.WillMeasurePage(self.pages[0]) |
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3)) |
results.DidMeasurePage() |
- results.AddValue(failure.FailureValue.FromMessage(self.pages[0], 'message')) |
+ results.AddFailureMessage(self.pages[0], 'message') |
results.WillMeasurePage(self.pages[1]) |
results.AddValue(scalar.ScalarValue(self.pages[1], 'a', 'seconds', 7)) |
results.DidMeasurePage() |
- results.AddValue(failure.FailureValue.FromMessage(self.pages[1], 'message')) |
+ results.AddFailureMessage(self.pages[1], 'message') |
results.PrintSummary() |
self.assertEquals(results.results, []) |
@@ -159,7 +158,7 @@ |
results.DidMeasurePage() |
results.WillMeasurePage(self.pages[1]) |
- results.AddValue(failure.FailureValue.FromMessage(self.pages[1], 'Failure')) |
+ results.AddFailureMessage(self.pages[1], "Failure") |
results.DidMeasurePage() |
results.WillMeasurePage(self.pages[2]) |
@@ -167,7 +166,6 @@ |
results.DidMeasurePage() |
values = results.all_page_specific_values |
- self.assertEquals(3, len(values)) |
- self.assertEquals( |
- [self.pages[0], self.pages[2]], results.pages_that_succeeded) |
- self.assertEquals([self.pages[1]], results.pages_that_had_failures) |
+ self.assertEquals(2, len(values)) |
+ self.assertEquals([self.pages[0], self.pages[2]], |
+ [v.page for v in values]) |