Refactor downloading archives in archive_info.py

tools/telemetry/telemetry/user_story/user_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 random
 import sys
 import time
@@ skipping 186 matching lines @@
   can continue running the remaining user stories.
   """
   test.ValidatePageSet(user_story_set)
 
   # Reorder page set based on options.
   user_stories = _ShuffleAndFilterUserStorySet(user_story_set, finder_options)
 
   if (not finder_options.use_live_sites and
       finder_options.browser_options.wpr_mode != wpr_modes.WPR_RECORD):
     _UpdateUserStoryArchivesIfChanged(user_story_set)
-    if not _CheckArchives(
+    if not _UpdateAndCheckArchives(
         user_story_set.archive_data_file, user_story_set.wpr_archive_info,
         user_stories):
       return
 
   for user_story in list(user_stories):
     if not test.CanRunForPage(user_story):
       results.WillRunPage(user_story)
       logging.debug('Skipping test: it cannot run for %s',
                     user_story.display_name)
       results.AddValue(skip.SkipValue(user_story, 'Test cannot run'))
@@ skipping 79 matching lines @@
     else:
       raise Exception(
           'pageset-shuffle-order-file flag can only be used with page set')
   user_stories = [u for u in user_story_set[:]
                   if user_story_filter.UserStoryFilter.IsSelected(u)]
   if finder_options.pageset_shuffle:
     random.shuffle(user_stories)
   return user_stories
 
 
-def _CheckArchives(archive_data_file, wpr_archive_info, filtered_user_stories):
+def _UpdateAndCheckArchives(archive_data_file, wpr_archive_info,
+                            filtered_user_stories):
   """Verifies that all user stories are local or have WPR archives.
 
   Logs warnings and returns False if any are missing.
   """
   # Report any problems with the entire user story set.
   if any(not user_story.is_local for user_story in filtered_user_stories):
     if not archive_data_file:
       logging.error('The user story set is missing an "archive_data_file" '
                     'property.\nTo run from live sites pass the flag '
                     '--use-live-sites.\nTo create an archive file add an '
                     'archive_data_file property to the user story set and then '
                     'run record_wpr.')
       return False
     if not wpr_archive_info:
       logging.error('The archive info file is missing.\n'
                     'To fix this, either add svn-internal to your '
                     '.gclient using http://goto/read-src-internal, '
                     'or create a new archive using record_wpr.')
       return False
+    wpr_archive_info.DownloadArchivesIfNeeded()
 
   # Report any problems with individual user story.
   user_stories_missing_archive_path = []
   user_stories_missing_archive_data = []
   for user_story in filtered_user_stories:
     if not user_story.is_local:
       archive_path = wpr_archive_info.WprFilePathForUserStory(user_story)
       if not archive_path:
         user_stories_missing_archive_path.append(user_story)
       elif not os.path.isfile(archive_path):
@@ skipping 42 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.')