| Index: tools/perf/measurements/thread_times_unittest.py
|
| diff --git a/tools/perf/measurements/thread_times_unittest.py b/tools/perf/measurements/thread_times_unittest.py
|
| index f86bd33d3b55ae326a9a8a79e33811408b5c69dd..65f1800c341e8517b6f0de75175cfb89b4e5332c 100644
|
| --- a/tools/perf/measurements/thread_times_unittest.py
|
| +++ b/tools/perf/measurements/thread_times_unittest.py
|
| @@ -44,6 +44,31 @@ class ThreadTimesUnitTest(page_test_test_case.PageTestTestCase):
|
| cpu_time = results.FindAllPageSpecificValuesNamed(cpu_time_name)
|
| self.assertEquals(len(cpu_time), 1)
|
|
|
| + def testWithSilkResults(self):
|
| + ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html')
|
| + measurement = thread_times.ThreadTimes()
|
| + self._options.report_silk_results = True
|
| + results = self.RunMeasurement(measurement, ps, options = self._options)
|
| + self.assertEquals(0, len(results.failures))
|
| +
|
| + for category in timeline.ReportSilkResults:
|
| + cpu_time_name = timeline.ThreadCpuTimeResultName(category)
|
| + cpu_time = results.FindAllPageSpecificValuesNamed(cpu_time_name)
|
| + self.assertEquals(len(cpu_time), 1)
|
| +
|
| + def testWithSilkDetails(self):
|
| + ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html')
|
| + measurement = thread_times.ThreadTimes()
|
| + self._options.report_silk_details = True
|
| + results = self.RunMeasurement(measurement, ps, options = self._options)
|
| + self.assertEquals(0, len(results.failures))
|
| +
|
| + main_thread = "renderer_main"
|
| + expected_trace_categories = ["blink", "cc", "idle"]
|
| + for trace_category in expected_trace_categories:
|
| + value_name = timeline.ThreadDetailResultName(main_thread, trace_category)
|
| + values = results.FindAllPageSpecificValuesNamed(value_name)
|
| + self.assertEquals(len(values), 1)
|
|
|
| def testCleanUpTrace(self):
|
| self.TestTracingCleanedUp(thread_times.ThreadTimes, self._options)
|
|
|