[Pywebsocket PerformanceTests 2/2] Add blink_perf.pywebsocket

tools/perf/benchmarks/blink_perf.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
+from benchmarks import pywebsocket_server
 from telemetry import benchmark
 from telemetry import page as page_module
 from telemetry.core import util
 from telemetry.page import page_set
 from telemetry.page import page_test
 from telemetry.value import list_of_scalar_values
 
 
 BLINK_PERF_BASE_DIR = os.path.join(util.GetChromiumSrcDir(),
                                    'third_party', 'WebKit', 'PerformanceTests')
@@ skipping 77 matching lines @@
       units = parts[-1]
       metric = page.display_name.split('.')[0].replace('/', '_')
       results.AddValue(list_of_scalar_values.ListOfScalarValues(
           results.current_page, metric, units, values))
 
       break
 
     print log
 
 
+class _BlinkPerfWithPywebsocketMeasurement(_BlinkPerfMeasurement):
+  """Runs a Blink performance test with pywebsocket server."""
+  run_pywebsocket_server = True

[nednguyen, 2015/01/05 23:10:58]

What is this variable for?

[hiroshige, 2015/01/06 05:42:51]

Removed.

+
+  def __init__(self):
+    super(_BlinkPerfWithPywebsocketMeasurement, self).__init__()
+    self.needs_pywebsocket_server = True

[nednguyen, 2015/01/05 23:10:58]

also this one?

[hiroshige, 2015/01/06 05:42:51]

Removed.

+
+  def CustomizeBrowserOptions(self, options):
+    super(_BlinkPerfWithPywebsocketMeasurement, self).CustomizeBrowserOptions(
+        options)
+    # Cross-origin accesses are needed to run benchmarks spanning two servers,
+    # the Telemetry's HTTP server and the pywebsocket server.
+    options.AppendExtraBrowserArgs([
+        '--disable-web-security'
+    ])
+
+  def DidStartBrowser(self, browser):
+    if browser.GetRunningLocalServer(
+        pywebsocket_server.PywebsocketServer, None):
+      return
+
+    server = pywebsocket_server.PywebsocketServer()
+    browser.StartLocalServer(server)
+    return
+

[nednguyen, 2015/01/05 23:10:58]

I don't see you override the ValidateAndMeasurePage or RunPage method, so what
does this measurement output?

[hiroshige, 2015/01/06 05:42:51]

ValidateAndMeasurePage is overridden by the parent class, _BlinkPerfMeasurement.

+
 class _BlinkPerfFullFrameMeasurement(_BlinkPerfMeasurement):
   def __init__(self):
     super(_BlinkPerfFullFrameMeasurement, self).__init__()
     self._blink_perf_js += '\nwindow.fullFrameMeasurement = true;'
 
   def CustomizeBrowserOptions(self, options):
     super(_BlinkPerfFullFrameMeasurement, self).CustomizeBrowserOptions(
         options)
     # Full layout measurement needs content_shell with internals testing API.
     assert 'content-shell' in options.browser_type
@@ skipping 123 matching lines @@
 
 # This benchmark is for local testing, doesn't need to run on bots.
 @benchmark.Disabled()
 class BlinkPerfXMLHttpRequest(benchmark.Benchmark):
   tag = 'xml_http_request'
   test = _BlinkPerfMeasurement
 
   def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'XMLHttpRequest')
     return CreatePageSetFromPath(path, SKIPPED_FILE)
+
+
+class BlinkPerfPywebsocket(benchmark.Benchmark):
+  tag = 'pywebsocket'
+  test = _BlinkPerfWithPywebsocketMeasurement
+
+  def CreatePageSet(self, options):
+    path = os.path.join(BLINK_PERF_BASE_DIR, 'Pywebsocket')
+    return CreatePageSetFromPath(path, SKIPPED_FILE)