| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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.page import page as page_module | 6 from telemetry.page import page as page_module |
| 7 from telemetry.results import page_test_results | 7 from telemetry.results import page_test_results |
| 8 from telemetry.timeline import model as model_module | 8 from telemetry.timeline import model as model_module |
| 9 from telemetry.unittest_util import options_for_unittests | 9 from telemetry.unittest_util import options_for_unittests |
| 10 from telemetry.unittest_util import page_test_test_case | 10 from telemetry.unittest_util import page_test_test_case |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 | 231 |
| 232 self._AssertResultsEqual(expected, _ActualValues(results)) | 232 self._AssertResultsEqual(expected, _ActualValues(results)) |
| 233 | 233 |
| 234 def _AssertResultsEqual(self, expected, actual): | 234 def _AssertResultsEqual(self, expected, actual): |
| 235 for key in expected.iterkeys(): | 235 for key in expected.iterkeys(): |
| 236 self.assertIn(key, actual.keys()) | 236 self.assertIn(key, actual.keys()) |
| 237 self.assertEqual(expected[key], actual[key], | 237 self.assertEqual(expected[key], actual[key], |
| 238 'Result for [' + key + '] - expected ' + str(expected[key]) + | 238 'Result for [' + key + '] - expected ' + str(expected[key]) + |
| 239 ' but got ' + str(actual[key])) | 239 ' but got ' + str(actual[key])) |
| 240 | 240 |
| 241 def testCleanUpTrace(self): | |
| 242 self.TestTracingCleanedUp(v8_gc_times.V8GCTimes, self._options) | |
| 243 | |
| 244 | 241 |
| 245 def _ActualValues(results): | 242 def _ActualValues(results): |
| 246 return dict(list( | 243 return dict(list( |
| 247 (v.name, (v.units, v.value)) | 244 (v.name, (v.units, v.value)) |
| 248 for v in results.all_page_specific_values | 245 for v in results.all_page_specific_values |
| 249 )) | 246 )) |
| 250 | 247 |
| 251 | 248 |
| 252 def _GetEmptyResults(): | 249 def _GetEmptyResults(): |
| 253 return {'cpu_time': ('ms', 0.0), | 250 return {'cpu_time': ('ms', 0.0), |
| 254 'duration': ('ms', 0.0), | 251 'duration': ('ms', 0.0), |
| 255 'v8_gc_incremental_marking': ('ms', 0.0), | 252 'v8_gc_incremental_marking': ('ms', 0.0), |
| 256 'v8_gc_incremental_marking_idle_deadline_overrun': ('ms', 0.0), | 253 'v8_gc_incremental_marking_idle_deadline_overrun': ('ms', 0.0), |
| 257 'v8_gc_incremental_marking_outside_idle': ('ms', 0.0), | 254 'v8_gc_incremental_marking_outside_idle': ('ms', 0.0), |
| 258 'v8_gc_incremental_marking_percentage_idle': ('idle%', 0.0), | 255 'v8_gc_incremental_marking_percentage_idle': ('idle%', 0.0), |
| 259 'v8_gc_mark_compactor': ('ms', 0.0), | 256 'v8_gc_mark_compactor': ('ms', 0.0), |
| 260 'v8_gc_mark_compactor_idle_deadline_overrun': ('ms', 0.0), | 257 'v8_gc_mark_compactor_idle_deadline_overrun': ('ms', 0.0), |
| 261 'v8_gc_mark_compactor_outside_idle': ('ms', 0.0), | 258 'v8_gc_mark_compactor_outside_idle': ('ms', 0.0), |
| 262 'v8_gc_mark_compactor_percentage_idle': ('idle%', 0.0), | 259 'v8_gc_mark_compactor_percentage_idle': ('idle%', 0.0), |
| 263 'v8_gc_scavenger': ('ms', 0.0), | 260 'v8_gc_scavenger': ('ms', 0.0), |
| 264 'v8_gc_scavenger_idle_deadline_overrun': ('ms', 0.0), | 261 'v8_gc_scavenger_idle_deadline_overrun': ('ms', 0.0), |
| 265 'v8_gc_scavenger_outside_idle': ('ms', 0.0), | 262 'v8_gc_scavenger_outside_idle': ('ms', 0.0), |
| 266 'v8_gc_scavenger_percentage_idle': ('idle%', 0.0), | 263 'v8_gc_scavenger_percentage_idle': ('idle%', 0.0), |
| 267 'v8_gc_total': ('ms', 0.0), | 264 'v8_gc_total': ('ms', 0.0), |
| 268 'v8_gc_total_idle_deadline_overrun': ('ms', 0.0), | 265 'v8_gc_total_idle_deadline_overrun': ('ms', 0.0), |
| 269 'v8_gc_total_outside_idle': ('ms', 0.0)} | 266 'v8_gc_total_outside_idle': ('ms', 0.0)} |
| OLD | NEW |