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

telemetry/telemetry/internal/story_runner.py

Index: telemetry/telemetry/internal/story_runner.py
diff --git a/telemetry/telemetry/internal/story_runner.py b/telemetry/telemetry/internal/story_runner.py
index 84e01a387e9972b41485cefc8d07980fc3f532af..a5dcfd9d33dcbe5b1590df57ce2195c2c17dd18b 100644
--- a/telemetry/telemetry/internal/story_runner.py
+++ b/telemetry/telemetry/internal/story_runner.py
@@ -59,6 +59,11 @@ def AddCommandLineArgs(parser):
                     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)
@@ -68,6 +73,9 @@ def ProcessCommandLineArgs(parser, args):
     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):
@@ -225,6 +233,8 @@ def Run(test, story_set, finder_options, results, max_failures=None,
             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: