[Telemetry][Android] Wait for device under test to cool between pages.

telemetry/telemetry/internal/story_runner.py

 # Copyright 2014 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 logging
 import optparse
 import os
 import sys
 import time
 
@@ skipping 41 matching lines @@
   group.add_option('--use-live-sites',
       dest='use_live_sites', action='store_true',
       help='Run against live sites and ignore the Web Page Replay archives.')
   parser.add_option_group(group)
 
   parser.add_option('-d', '--also-run-disabled-tests',
                     dest='run_disabled_tests',
                     action='store_true', default=False,
                     help='Ignore @Disabled and @Enabled restrictions.')
 
+  # Environment options
+  parser.add_option('--temperature', dest='target_temp', default=None, type=int,
+                    help='Temperature to wait for between pages. In tenths of'

[charliea (OOO until 10-5), 2016/12/02 16:03:12]

Can we accept and pass around the temperature value as actual degrees celsius,
and only convert it at the last minute? We can mention here that the precision
is limited to 1/10 of a degree C, but it seems like this would be a lot more
intuitive to users.

[rnephew (Reviews Here), 2016/12/12 16:58:58]

Done.

+                         ' degree C.')
+
 def ProcessCommandLineArgs(parser, args):
   story_module.StoryFilter.ProcessCommandLineArgs(parser, args)
   results_options.ProcessCommandLineArgs(parser, args)
 
   # Page set options
   if args.page_repeat < 1:
     parser.error('--page-repeat must be a positive integer.')
   if args.pageset_repeat < 1:
     parser.error('--pageset-repeat must be a positive integer.')
+  if args.target_temp is not None:
+    if args.target_temp < 300 or args.target_temp > 400:
+      parser.error('--temperature needs to be between 300 and 400')
 
 
 def _RunStoryAndProcessErrorIfNeeded(story, results, state, test):
   def ProcessError(description=None):
     state.DumpStateUponFailure(story, results)
     results.AddValue(failure.FailureValue(story, sys.exc_info(), description))
   try:
     if isinstance(test, story_test.StoryTest):
       test.WillRunStory(state.platform)
     state.WillRunStory(story)
@@ skipping 137 matching lines @@
             if not state:
               # Construct shared state by using a copy of finder_options. Shared
               # state may update the finder_options. If we tear down the shared
               # state after this story run, we want to construct the shared
               # state for the next story from the original finder_options.
               state = group.shared_state_class(
                   test, finder_options.Copy(), story_set)
             results.WillRunPage(
                 story, storyset_repeat_counter, story_repeat_counter)
             try:
+              if finder_options.target_temp:
+                state.platform.WaitForTemperature(finder_options.target_temp)
               _WaitForThermalThrottlingIfNeeded(state.platform)
               _RunStoryAndProcessErrorIfNeeded(story, results, state, test)
             except exceptions.Error:
               # Catch all Telemetry errors to give the story a chance to retry.
               # The retry is enabled by tearing down the state and creating
               # a new state instance in the next iteration.
               try:
                 # If TearDownState raises, do not catch the exception.
                 # (The Error was saved as a failure value.)
                 state.TearDownState()
@@ skipping 197 matching lines @@
     logging.warning('Device is thermally throttled before running '
                     'performance tests, results will vary.')
 
 
 def _CheckThermalThrottling(platform):
   if not platform.CanMonitorThermalThrottling():
     return
   if platform.HasBeenThermallyThrottled():
     logging.warning('Device has been thermally throttled during '
                     'performance tests, results will vary.')