Use dummynet-based network simulation for Mac 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 2257 matching lines @@
       '--activate-on-launch',
       '--no-first-run',
       '--no-proxy-server',
       ]
 
   @classmethod
   def Path(cls, key, **kwargs):
     return FormatChromePath(cls._PATHS[key], **kwargs)
 
   @classmethod
-  def ReplayServer(cls, test_name):
+  def ReplayServer(cls, test_name, replay_options=None):
     archive_path = cls.Path('archive', test_name=test_name)
-    return webpagereplay.ReplayServer(archive_path)
+    return webpagereplay.ReplayServer(archive_path, replay_options)
 
 
 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:
@@ skipping 12 matching lines @@
       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 PageCyclerReplay.ReplayServer(test_name) as replay_server:
-      if replay_server.is_record_mode:
+    replay_options = None
+    if self.IsMac():

[Nirnimesh, 2012/08/22 23:40:49]

please add a comment here

+      replay_options = ('--no-admin-check', '--net', 'fios')
+    with PageCyclerReplay.ReplayServer(test_name, replay_options) as server:
+      if server.is_record_mode:
         self._num_iterations = 1
       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 328 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()