Make it easy to use Web Page Replay with non-page_cycler tests.

chrome/test/functional/perf.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Basic pyauto performance tests.
 
 For tests that need to be run for multiple iterations (e.g., so that average
 and standard deviation values can be reported), the default number of iterations
 run for each of these tests is specified by |_DEFAULT_NUM_ITERATIONS|.
@@ skipping 1720 matching lines @@
 class PopularSitesScrollTest(BaseScrollTest):
   """Measures scrolling performance on recorded versions of popular sites."""
 
   def ExtraChromeFlags(self):
     """Ensures Chrome is launched with custom flags.
 
     Returns:
       A list of extra flags to pass to Chrome when it is launched.
     """
     return super(PopularSitesScrollTest,
-                 self).ExtraChromeFlags() + WebPageReplay.CHROME_FLAGS
+                 self).ExtraChromeFlags() + PageCyclerReplay.CHROME_FLAGS
 
   def _GetUrlList(self, test_name):
     """Returns list of recorded sites."""
-    with open(WebPageReplay.Path('page_sets', test_name=test_name)) as f:
+    sites_path = PageCyclerReplay.Path('page_sets', test_name=test_name)
+    with open(sites_path) as f:
       sites_text = f.read()
     js = """
       %s
       window.domAutomationController.send(JSON.stringify(pageSets));
     """ % sites_text
     page_sets = eval(self.ExecuteJavascript(js))
     return list(itertools.chain(*page_sets))[1:]  # Skip first.
 
   def _PrintScrollResults(self, results):
     self._PrintSummaryResults(
@@ skipping 11 matching lines @@
         [r.repeat_frame_times.GetPercentBelow60Fps() for r in results],
         'percent', 'PercentBelow60FPS')
     self._PrintSummaryResults(
         'first_paint_time', [r.first_paint_time for r in results],
         'ms', 'FirstPaintTime')
 
   def test2012Q3(self):
     test_name = '2012Q3'
     urls = self._GetUrlList(test_name)
     results = []
-    with WebPageReplay().GetReplayServer(test_name):
+    with PageCyclerReplay.ReplayServer(test_name):

[fdeng1, 2012/07/26 20:51:19]

I think change it to PageCyclerReplay()?

[slamm_google, 2012/07/26 23:46:59]

Thanks for catching that. I changed ReplayServer to a classmethod.

       for iteration in range(self._num_iterations):
         for url in urls:
           result = self.RunSingleInvocation(url)
           fps = result.initial_frame_times.GetFps()
           assert fps, '%s did not scroll' % url
           logging.info('Iteration %d of %d: %f fps', iteration,
                        self._num_iterations, fps)
           results.append(result)
     self._PrintScrollResults(results)
 
@@ skipping 380 matching lines @@
   def testIntl2File(self):
     self.RunPageCyclerTest('intl2', 'Intl2File')
 
   def testMozFile(self):
     self.RunPageCyclerTest('moz', 'MozFile')
 
   def testMoz2File(self):
     self.RunPageCyclerTest('moz2', 'Moz2File')
 
 
-class WebPageReplay(object):
+class PageCyclerReplay(object):
   """Run page cycler tests with network simulation via Web Page Replay.
 
   Web Page Replay is a proxy that can record and "replay" web pages with
   simulated network characteristics -- without having to edit the pages
   by hand. With WPR, tests can use "real" web content, and catch
   performance issues that may result from introducing network delays and
   bandwidth throttling.
-
-  Environment Variables:
-    WPR_RECORD: if set, puts Web Page Replay in record mode instead of replay.
-    WPR_REPLAY_DIR: path to alternate Web Page Replay source (for development).
-    WPR_ARCHIVE_PATH: path to alternate archive file (e.g. '/tmp/foo.wpr').
   """
   _PATHS = {
       'archive':    'src/data/page_cycler/webpagereplay/{test_name}.wpr',
       'page_sets':  'src/tools/page_cycler/webpagereplay/tests/{test_name}.js',
       'start_page': 'src/tools/page_cycler/webpagereplay/start.html',
       'extension':  'src/tools/page_cycler/webpagereplay/extension',
-      'replay':     'src/third_party/webpagereplay',
-      'logs':       'src/webpagereplay_logs',
       }
 
-  _BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                           '..', '..', '..', '..'))
-  CHROME_FLAGS = [
-      '--host-resolver-rules=MAP * %s' % webpagereplay.REPLAY_HOST,
-      '--testing-fixed-http-port=%s' % webpagereplay.HTTP_PORT,
-      '--testing-fixed-https-port=%s' % webpagereplay.HTTPS_PORT,
+  CHROME_FLAGS = webpagereplay.CHROME_FLAGS + [
       '--log-level=0',
       '--disable-background-networking',
       '--enable-experimental-extension-apis',
       '--enable-logging',
       '--enable-stats-table',
       '--enable-benchmarking',
-      '--ignore-certificate-errors',
       '--metrics-recording-only',
       '--activate-on-launch',
       '--no-first-run',
       '--no-proxy-server',
       ]
 
   @classmethod
   def Path(cls, key, **kwargs):
-    """Provide paths for tests using Web Page Replay."""
-    chromium_path = cls._PATHS[key].format(**kwargs)
-    return os.path.join(cls._BASE_DIR, *chromium_path.split('/'))
+    return webpagereplay.FormatChromiumPath(cls._PATHS[key], **kwargs)
 
-  def _ArchivePath(self, test_name):
-    archive_path = self.archive_path or self.Path('archive',
-                                                  test_name=test_name)
-    if self.is_record_mode:
-      archive_dir = os.path.dirname(archive_path)
-      assert os.path.exists(archive_dir), \
-          'Archive directory does not exist: %s' % archive_dir
-    else:
-      assert os.path.exists(archive_path), \
-          'Archive file path does not exist: %s' % archive_path
-    return archive_path
-
-  def __init__(self):
-    self.archive_path = os.environ.get('WPR_ARCHIVE_PATH')
-    self.replay_dir = os.environ.get('WPR_REPLAY_DIR', self.Path('replay'))
-    self.is_record_mode = 'WPR_RECORD' in os.environ
-    if self.is_record_mode:
-      self._num_iterations = 1
-
-  def GetReplayServer(self, test_name):
-    replay_options = []
-    replay_options.append('--no-dns_forwarding')
-    if self.is_record_mode:
-      replay_options.append('--record')
-    return webpagereplay.ReplayServer(
-        self.replay_dir,
-        self._ArchivePath(test_name),
-        self.Path('logs'),
-        replay_options)
+  def ReplayServer(self, test_name):
+    archive_path = self.Path('archive', test_name=test_name)
+    return webpagereplay.ReplayServer(archive_path)
 
 
 class PageCyclerNetSimTest(BasePageCyclerTest):
   """Tests to run Web Page Replay backed page cycler tests."""
   MAX_ITERATION_SECONDS = 180
 
   def ExtraChromeFlags(self):
     """Ensures Chrome is launched with custom flags.
 
     Returns:
       A list of extra flags to pass to Chrome when it is launched.
     """
     flags = super(PageCyclerNetSimTest, self).ExtraChromeFlags()
-    flags.append('--load-extension=%s' % WebPageReplay.Path('extension'))
-    flags.extend(WebPageReplay.CHROME_FLAGS)
+    flags.append('--load-extension=%s' %
+                 PageCyclerReplay.Path('extension'))
+    flags.extend(PageCyclerReplay.CHROME_FLAGS)
     return flags
 
   def StartUrl(self, test_name, iterations):
+    start_path = PageCyclerReplay.Path('start_page')
     start_url = 'file://%s?test=%s&iterations=%d' % (
-        WebPageReplay.Path('start_page'), test_name, iterations)
+        start_path, test_name, iterations)
     if self.use_auto:
       start_url += '&auto=1'
     return start_url
 
   def RunPageCyclerTest(self, test_name, description):
     """Runs the specified PageCycler test.
 
     Args:
       test_name: name for archive (.wpr) and config (.js) files.
       description: a string description for the test
     """
-    with WebPageReplay().GetReplayServer(test_name):
+    with PageCyclerReplay.ReplayServer(test_name) as replay_server:

[fdeng1, 2012/07/26 20:51:19]

->PageCyclerReplay()

+      if replay_server.is_record_mode:
+        self._num_iterations = 1

[fdeng1, 2012/07/26 20:51:19]

I haven't figure out why, but it complains replay_server is None.

And do we need add this piece of code also to PopularSitesScrollTest.test2012Q3?

[slamm_google, 2012/07/26 23:46:59]

Not sure about the None error. Try it again with ReplayServer as classmethod.

I added the num_iterations fix to PopularSitesScrollTest.

[fdeng1, 2012/07/27 00:45:10]

I am still have the same trouble after patching the new changes.

fdeng@fdeng:/usr/local/google/chrome/src/chrome/test/functional$ WPR_RECORD=1
python perf.py perf.PopularSitesScrollTest.test2012Q3
Will not try to restart with the correct version of python as
DO_NOT_RESTART_PYTHON_FOR_PYAUTO is set.
HTTP server started on 127.0.0.1:40036...
sending server_data: {"host": "127.0.0.1", "port": 40036} (36 bytes)
[ RUN        ] perf.PopularSitesScrollTest.test2012Q3: "None"
2012-07-26 17:42:13,884 INFO     Starting to wait up to 60.000000s for idle
CPU...
2012-07-26 17:42:15,888 INFO     Current CPU utilization = 0.007940.
2012-07-26 17:42:15,888 INFO     Wait for idle CPU took 2.000000s (utilization =
0.007940).
[      ERROR ] perf.PopularSitesScrollTest.test2012Q3

======================================================================
ERROR: perf.PopularSitesScrollTest.test2012Q3: "None"
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/local/google/chrome/src/chrome/test/functional/perf.py", line 1779,
in test2012Q3
    if replay_server.is_record_mode:
AttributeError: 'NoneType' object has no attribute 'is_record_mode'

----------------------------------------------------------------------
Ran 1 test in 7.328s

       super_self = super(PageCyclerNetSimTest, self)
       super_self.RunPageCyclerTest(test_name, description)
 
   def test2012Q2(self):
     self.RunPageCyclerTest('2012Q2', '2012Q2')
 
 
 class MemoryTest(BasePerfTest):
   """Tests to measure memory consumption under different usage scenarios."""
 
@@ skipping 327 matching lines @@
     """Identifies the port number to which the server is currently bound.
 
     Returns:
       The numeric port number to which the server is currently bound.
     """
     return self._server.server_address[1]
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()