[Pywebsocket PerformanceTests 2/2] Add blink_perf.pywebsocket

tools/perf/benchmarks/blink_perf.py

Index: tools/perf/benchmarks/blink_perf.py
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
index f6fa81c3def313faef1b1efd74ed155b7e3a6cf1..93c5d8168d6ad8579e35f06dd8aa7ef419b9ef83 100644
--- a/tools/perf/benchmarks/blink_perf.py
+++ b/tools/perf/benchmarks/blink_perf.py
@@ -4,6 +4,7 @@
 
 import os
 
+from benchmarks import pywebsocket_server
 from telemetry import benchmark
 from telemetry import page as page_module
 from telemetry.core import util
@@ -101,6 +102,33 @@ class _BlinkPerfMeasurement(page_test.PageTest):
     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__()
@@ -244,3 +272,12 @@ class BlinkPerfXMLHttpRequest(benchmark.Benchmark):
   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)