| Index: tools/perf/measurements/timeline_based_measurement_unittest.py
|
| diff --git a/tools/perf/measurements/timeline_based_measurement_unittest.py b/tools/perf/measurements/timeline_based_measurement_unittest.py
|
| index 8c7959375a5829ad0864aef49d88fb3f04a4dd7b..72abeb5e8e87a73672a924c73c047053521bedc0 100644
|
| --- a/tools/perf/measurements/timeline_based_measurement_unittest.py
|
| +++ b/tools/perf/measurements/timeline_based_measurement_unittest.py
|
| @@ -90,9 +90,9 @@ class TimelineBasedMetricsTests(unittest.TestCase):
|
| metric.AddResults(results)
|
| results.DidMeasurePage()
|
|
|
| - v = results.FindAllPageSpecificValuesNamed('LogicalName1/FakeSmoothMetric')
|
| + v = results.FindAllPageSpecificValuesNamed('LogicalName1-FakeSmoothMetric')
|
| self.assertEquals(len(v), 1)
|
| - v = results.FindAllPageSpecificValuesNamed('LogicalName2/FakeLoadingMetric')
|
| + v = results.FindAllPageSpecificValuesNamed('LogicalName2-FakeLoadingMetric')
|
| self.assertEquals(len(v), 1)
|
|
|
|
|
| @@ -105,9 +105,15 @@ class TimelineBasedMeasurementTest(
|
| def testTimelineBasedForSmoke(self):
|
| ps = self.CreatePageSetFromFileInUnittestDataDir(
|
| 'interaction_enabled_page.html')
|
| - setattr(ps.pages[0], 'smoothness', {'action': 'wait',
|
| - 'javascript': 'window.animationDone'})
|
| + setattr(ps.pages[0], 'smoothness', [{'action': 'scroll'},
|
| + {'action': 'wait',
|
| + 'javascript': 'window.animationDone'}])
|
| measurement = tbm_module.TimelineBasedMeasurement()
|
| results = self.RunMeasurement(measurement, ps,
|
| options=self._options)
|
| self.assertEquals(0, len(results.failures))
|
| + v = results.FindAllPageSpecificValuesNamed('CenterAnimation-jank')
|
| + self.assertEquals(len(v), 2)
|
| + v = results.FindAllPageSpecificValuesNamed('DrawerAnimation-jank')
|
| + self.assertEquals(len(v), 2)
|
| +
|
|
|