Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Side by Side Diff: tools/perf/measurements/page_cycler_unittest.py

Issue 562243004: Revert of Change PageTest.WillStartBrowser to depend on platform instead of browser object as it would not ha… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tools/perf/measurements/page_cycler.py ('k') | tools/perf/measurements/smoothness.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 import unittest 5 import unittest
6 6
7 from telemetry.core import browser_options 7 from telemetry.core import browser_options
8 from telemetry.page import page_runner 8 from telemetry.page import page_runner
9 from telemetry.results import page_test_results 9 from telemetry.results import page_test_results
10 from telemetry.unittest import simple_mock 10 from telemetry.unittest import simple_mock
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 mock_memory_module = simple_mock.MockObject() 103 mock_memory_module = simple_mock.MockObject()
104 mock_memory_module.ExpectCall( 104 mock_memory_module.ExpectCall(
105 'MemoryMetric').WithArgs(simple_mock.DONT_CARE).WillReturn( 105 'MemoryMetric').WithArgs(simple_mock.DONT_CARE).WillReturn(
106 mock_memory_metric) 106 mock_memory_metric)
107 107
108 real_memory_module = page_cycler.memory 108 real_memory_module = page_cycler.memory
109 try: 109 try:
110 page_cycler.memory = mock_memory_module 110 page_cycler.memory = mock_memory_module
111 browser = FakeBrowser() 111 browser = FakeBrowser()
112 cycler.WillStartBrowser(options.browser_options.platform) 112 cycler.WillStartBrowser(browser)
113 cycler.DidStartBrowser(browser) 113 cycler.DidStartBrowser(browser)
114 finally: 114 finally:
115 page_cycler.memory = real_memory_module 115 page_cycler.memory = real_memory_module
116 116
117 return cycler 117 return cycler
118 118
119 def testOptionsColdLoadNoArgs(self): 119 def testOptionsColdLoadNoArgs(self):
120 cycler = self.SetUpCycler([]) 120 cycler = self.SetUpCycler([])
121 121
122 self.assertEquals(cycler._cold_run_start_index, 5) 122 self.assertEquals(cycler._cold_run_start_index, 5)
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 self.assertEqual(values[0].name, '%s.page_load_time' % chart_name) 206 self.assertEqual(values[0].name, '%s.page_load_time' % chart_name)
207 self.assertEqual(values[0].units, 'ms') 207 self.assertEqual(values[0].units, 'ms')
208 208
209 for value, expected in zip(values[1:], ['gpu', 'renderer', 'browser']): 209 for value, expected in zip(values[1:], ['gpu', 'renderer', 'browser']):
210 self.assertEqual(value.page, page) 210 self.assertEqual(value.page, page)
211 self.assertEqual(value.name, 211 self.assertEqual(value.name,
212 'cpu_utilization.cpu_utilization_%s' % expected) 212 'cpu_utilization.cpu_utilization_%s' % expected)
213 self.assertEqual(value.units, '%') 213 self.assertEqual(value.units, '%')
214 214
215 cycler.DidNavigateToPage(page, tab) 215 cycler.DidNavigateToPage(page, tab)
OLDNEW
« no previous file with comments | « tools/perf/measurements/page_cycler.py ('k') | tools/perf/measurements/smoothness.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698