customtabs: Output all the available metrics after a timeout.

tools/android/customtabs_benchmark/scripts/customtabs_benchmark.py

 #!/usr/bin/python
 #
 # Copyright 2015 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.
 
 """Loops Custom Tabs tests and outputs the results into a CSV file."""
 
 import contextlib
 import logging
@@ skipping 72 matching lines @@
   Returns:
     The output line (str), like this (one line only):
     <warmup>,<prerender_mode>,<delay_to_may_launch_url>,<delay_to_launch>,
       <intent_sent_ms>,<page_load_started_ms>,<page_load_finished_ms>,
       <first_contentful_paint>
     or None on error.
   """
   if not device.HasRoot():
     device.EnableRoot()
 
+  timeout_s = 20
+  logcat_timeout = int(timeout_s + delay_to_launch_url / 1000.
+                       + delay_to_launch_url / 1000.) + 3;

[droger, 2016/11/24 14:08:10]

Why is delay_to_launch_url repeated? did you mean delay_to_may_launch_url?

[Benoit L, 2016/11/24 14:34:17]

Oops, thanks!
Done.

+
   with device_setup.FlagReplacer(device, _COMMAND_LINE_PATH, chrome_args):
     launch_intent = intent.Intent(
         action='android.intent.action.MAIN',
         package=_TEST_APP_PACKAGE_NAME,
         activity='org.chromium.customtabs.test.MainActivity',
         extras={'url': str(url), 'warmup': warmup,
                 'speculation_mode': str(speculation_mode),
                 'delay_to_may_launch_url': delay_to_may_launch_url,
-                'delay_to_launch_url': delay_to_launch_url})
+                'delay_to_launch_url': delay_to_launch_url,
+                'timeout': timeout_s})
     result_line_re = re.compile(r'CUSTOMTABSBENCH.*: (.*)')
     logcat_monitor = device.GetLogcatMonitor(clear=True)
     logcat_monitor.Start()
     device.ForceStop(_CHROME_PACKAGE)
     device.ForceStop(_TEST_APP_PACKAGE_NAME)
 
     ResetChromeLocalState(device)
 
     if cold:
       cache_control.CacheControl(device).DropRamCaches()
 
     device.StartActivity(launch_intent, blocking=True)
 
     match = None
     try:
-      match = logcat_monitor.WaitFor(result_line_re, timeout=20)
+      match = logcat_monitor.WaitFor(result_line_re, timeout=logcat_timeout)
     except device_errors.CommandTimeoutError as _:
       logging.warning('Timeout waiting for the result line')
     logcat_monitor.Stop()
     logcat_monitor.Close()
     return match.group(1) if match is not None else None
 
 
 def LoopOnDevice(device, configs, output_filename, wpr_archive_path=None,
                  wpr_record=None, network_condition=None, wpr_log_path=None,
                  once=False, should_stop=None):
@@ skipping 75 matching lines @@
                     default='https://www.android.com')
   parser.add_option('--warmup', help='Call warmup.', default=False,
                     action='store_true')
   parser.add_option('--speculation_mode', default='prerender',
                     help='The speculation mode (prerender, disabled, '
                     'speculative_prefetch or no_state_prefetch).',
                     choices=['prerender', 'disabled', 'speculative_prefetch',
                              'no_state_prefetch'])
   parser.add_option('--delay_to_may_launch_url',
                     help='Delay before calling mayLaunchUrl() in ms.',
-                    type='int')
+                    type='int', default=1000)
   parser.add_option('--delay_to_launch_url',
                     help='Delay before calling launchUrl() in ms.',
-                    type='int')
+                    type='int', default=-1)
   parser.add_option('--cold', help='Purge the page cache before each run.',
                     default=False, action='store_true')
   parser.add_option('--output_file', help='Output file (append). "-" for '
                     'stdout')
   parser.add_option('--once', help='Run only one iteration.',
                     action='store_true', default=False)
 
   # WebPageReplay-related options.
   group = optparse.OptionGroup(
       parser, 'WebPageReplay options',
@@ skipping 50 matching lines @@
       'delay_to_launch_url': options.delay_to_launch_url,
       'cold': options.cold,
   }
   LoopOnDevice(device, [config], options.output_file, options.wpr_archive,
                options.record, options.network_condition, options.wpr_log,
                once=options.once)
 
 
 if __name__ == '__main__':
   main()