| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from telemetry.core import wpr_modes | 5 from telemetry.core import wpr_modes |
| 6 from telemetry import decorators | 6 from telemetry import decorators |
| 7 from telemetry.page import page | 7 from telemetry.page import page |
| 8 from telemetry.unittest_util import options_for_unittests | 8 from telemetry.unittest_util import options_for_unittests |
| 9 from telemetry.unittest_util import page_test_test_case | 9 from telemetry.unittest_util import page_test_test_case |
| 10 | 10 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 measurement = thread_times.ThreadTimes() | 47 measurement = thread_times.ThreadTimes() |
| 48 timeline_options = self._options | 48 timeline_options = self._options |
| 49 results = self.RunMeasurement(measurement, ps, options = timeline_options) | 49 results = self.RunMeasurement(measurement, ps, options = timeline_options) |
| 50 self.assertEquals(0, len(results.failures)) | 50 self.assertEquals(0, len(results.failures)) |
| 51 | 51 |
| 52 for category in timeline.TimelineThreadCategories.values(): | 52 for category in timeline.TimelineThreadCategories.values(): |
| 53 cpu_time_name = timeline.ThreadCpuTimeResultName(category) | 53 cpu_time_name = timeline.ThreadCpuTimeResultName(category) |
| 54 cpu_time = results.FindAllPageSpecificValuesNamed(cpu_time_name) | 54 cpu_time = results.FindAllPageSpecificValuesNamed(cpu_time_name) |
| 55 self.assertEquals(len(cpu_time), 1) | 55 self.assertEquals(len(cpu_time), 1) |
| 56 | 56 |
| 57 @decorators.Disabled('chromeos') # crbug.com/483212 |
| 57 def testWithSilkDetails(self): | 58 def testWithSilkDetails(self): |
| 58 ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html') | 59 ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html') |
| 59 measurement = thread_times.ThreadTimes(report_silk_details=True) | 60 measurement = thread_times.ThreadTimes(report_silk_details=True) |
| 60 results = self.RunMeasurement(measurement, ps, options = self._options) | 61 results = self.RunMeasurement(measurement, ps, options = self._options) |
| 61 self.assertEquals(0, len(results.failures)) | 62 self.assertEquals(0, len(results.failures)) |
| 62 | 63 |
| 63 main_thread = "renderer_main" | 64 main_thread = "renderer_main" |
| 64 expected_trace_categories = ["blink", "cc", "idle"] | 65 expected_trace_categories = ["blink", "cc", "idle"] |
| 65 for trace_category in expected_trace_categories: | 66 for trace_category in expected_trace_categories: |
| 66 value_name = timeline.ThreadDetailResultName(main_thread, trace_category) | 67 value_name = timeline.ThreadDetailResultName(main_thread, trace_category) |
| 67 values = results.FindAllPageSpecificValuesNamed(value_name) | 68 values = results.FindAllPageSpecificValuesNamed(value_name) |
| 68 self.assertEquals(len(values), 1) | 69 self.assertEquals(len(values), 1) |
| 69 | 70 |
| 70 def testCleanUpTrace(self): | 71 def testCleanUpTrace(self): |
| 71 self.TestTracingCleanedUp(thread_times.ThreadTimes, self._options) | 72 self.TestTracingCleanedUp(thread_times.ThreadTimes, self._options) |
| OLD | NEW |