OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 os | 5 import os |
6 | 6 |
7 from telemetry import test | 7 from telemetry import test |
8 from telemetry.core import util | 8 from telemetry.core import util |
9 from telemetry.page import page_measurement | 9 from telemetry.page import page_measurement |
10 from telemetry.page import page_set | 10 from telemetry.page import page_set |
11 | 11 |
12 | 12 |
13 class OctaneMeasurement(page_measurement.PageMeasurement): | 13 class OctaneMeasurement(page_measurement.PageMeasurement): |
14 def MeasurePage(self, _, tab, results): | 14 def MeasurePage(self, _, tab, results): |
15 js_is_done = """ | 15 js_is_done = """ |
16 completed && !document.getElementById("progress-bar-container")""" | 16 completed && !document.getElementById("progress-bar-container")""" |
17 def _IsDone(): | 17 def _IsDone(): |
18 return bool(tab.EvaluateJavaScript(js_is_done)) | 18 return bool(tab.EvaluateJavaScript(js_is_done)) |
19 util.WaitFor(_IsDone, 300, poll_interval=5) | 19 util.WaitFor(_IsDone, 300, poll_interval=5) |
20 | 20 |
21 js_get_results = """ | 21 js_get_results = """ |
22 var results = {} | 22 var results = {}; |
23 var result_divs = document.querySelectorAll('.p-result'); | 23 var result_divs = document.querySelectorAll('.p-result'); |
24 for (var r in result_divs) { | 24 for (var r in result_divs) { |
25 if (result_divs[r].id && result_divs[r].id.indexOf('Result-') == 0) | 25 if (result_divs[r].id && result_divs[r].id.indexOf('Result-') == 0) { |
nduca
2013/07/30 06:49:45
lets land this fix right away as a separate cl
chrisgao (Use stgao instead)
2013/07/31 19:05:41
Done in https://codereview.chromium.org/20987007/.
| |
26 var key = result_divs[r].id.replace('Result-', ''); | 26 var key = result_divs[r].id.replace('Result-', ''); |
27 results[key] = result_divs[r].innerHTML; | 27 results[key] = result_divs[r].innerHTML; |
28 } | |
28 } | 29 } |
29 var main_banner = document.getElementById("main-banner").innerHTML; | 30 var main_banner = document.getElementById("main-banner").innerHTML; |
30 var octane_score = main_banner.substr(main_banner.lastIndexOf(':') + 2); | 31 var octane_score = main_banner.substr(main_banner.lastIndexOf(':') + 2); |
31 results['score'] = octane_score; | 32 results['score'] = octane_score; |
32 JSON.stringify(results); | 33 JSON.stringify(results); |
33 """ | 34 """ |
34 result_dict = eval(tab.EvaluateJavaScript(js_get_results)) | 35 result_dict = eval(tab.EvaluateJavaScript(js_get_results)) |
35 for key, value in result_dict.iteritems(): | 36 for key, value in result_dict.iteritems(): |
36 if value == '...': | 37 if value == '...': |
37 continue | 38 continue |
38 data_type = 'unimportant' | 39 data_type = 'unimportant' |
39 if key == 'score': | 40 if key == 'score': |
40 data_type = 'default' | 41 data_type = 'default' |
41 results.Add(key, 'score (bigger is better)', value, data_type=data_type) | 42 results.Add(key, 'score (bigger is better)', value, data_type=data_type) |
42 | 43 |
43 | 44 |
44 class Octane(test.Test): | 45 class Octane(test.Test): |
45 """Google's Octane JavaScript benchmark.""" | 46 """Google's Octane JavaScript benchmark.""" |
46 test = OctaneMeasurement | 47 test = OctaneMeasurement |
47 | 48 |
48 def CreatePageSet(self, options): | 49 def CreatePageSet(self, options): |
49 octane_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', | 50 octane_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', |
50 'data', 'perf', 'third_party', 'octane') | 51 'data', 'perf', 'third_party', 'octane') |
51 return page_set.PageSet.FromDict({ | 52 return page_set.PageSet.FromDict({ |
52 'pages': [ | 53 'pages': [ |
53 { 'url': 'file:///index.html?auto=1' } | 54 { 'url': 'file:///index.html?auto=1' } |
54 ] | 55 ] |
55 }, octane_dir) | 56 }, octane_dir) |
OLD | NEW |