Revert of Refactor serving_dirs.

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
 
+from telemetry import decorators
 from telemetry import page as page_module
 from telemetry.core import exceptions
 from telemetry.core import wpr_modes
 from telemetry.page import page_set as page_set_module
 from telemetry.page import page_test
 from telemetry.page.actions import page_action
 from telemetry.results import results_options
 from telemetry.user_story import user_story_filter
 from telemetry.user_story import user_story_set as user_story_set_module
 from telemetry.util import cloud_storage
+from telemetry.util import exception_formatter
 from telemetry.value import failure
 from telemetry.value import skip
 
 
 class ArchiveError(Exception):
   pass
 
 
 def AddCommandLineArgs(parser):
   user_story_filter.UserStoryFilter.AddCommandLineArgs(parser)
@@ skipping 75 matching lines @@
     has_existing_exception = sys.exc_info() is not None
     try:
       state.DidRunUserStory(results)
     except Exception:
       if not has_existing_exception:
         raise
       # Print current exception and propagate existing exception.
       exception_formatter.PrintFormattedException(
           msg='Exception from DidRunUserStory: ')
 
+@decorators.Cache
+def _UpdateUserStoryArchivesIfChanged(user_story_set):
+  # Scan every serving directory for .sha1 files
+  # and download them from Cloud Storage. Assume all data is public.
+  all_serving_dirs = user_story_set.serving_dirs.copy()
+  # Add individual page dirs to all serving dirs.
+  for user_story in user_story_set:
+    if isinstance(user_story, page_module.Page) and user_story.is_file:
+      all_serving_dirs.add(user_story.serving_dir)
+  # Scan all serving dirs.
+  for serving_dir in all_serving_dirs:
+    if os.path.splitdrive(serving_dir)[1] == '/':
+      raise ValueError('Trying to serve root directory from HTTP server.')
+    for dirpath, _, filenames in os.walk(serving_dir):
+      for filename in filenames:
+        path, extension = os.path.splitext(
+            os.path.join(dirpath, filename))
+        if extension != '.sha1':
+          continue
+        cloud_storage.GetIfChanged(path, user_story_set.bucket)
+
+
 class UserStoryGroup(object):
   def __init__(self, shared_user_story_state_class):
     self._shared_user_story_state_class = shared_user_story_state_class
     self._user_stories = []
 
   @property
   def shared_user_story_state_class(self):
     return self._shared_user_story_state_class
 
   @property
@@ skipping 49 matching lines @@
   Stop execution for unexpected exceptions such as KeyboardInterrupt.
   We "white list" certain exceptions for which the user story runner
   can continue running the remaining user stories.
   """
   # Filter page set based on options.
   user_stories = filter(user_story_filter.UserStoryFilter.IsSelected,
                         user_story_set)
 
   if (not finder_options.use_live_sites and user_story_set.bucket and
       finder_options.browser_options.wpr_mode != wpr_modes.WPR_RECORD):
-    serving_dirs = user_story_set.serving_dirs
-    for directory in serving_dirs:
-      cloud_storage.GetFilesInDirectoryIfChanged(directory,
-                                                 user_story_set.bucket)
+    _UpdateUserStoryArchivesIfChanged(user_story_set)
     if not _UpdateAndCheckArchives(
         user_story_set.archive_data_file, user_story_set.wpr_archive_info,
         user_stories):
       return
 
   if not user_stories:
     return
 
   # Effective max failures gives priority to command-line flag value.
   effective_max_failures = finder_options.max_failures
@@ skipping 135 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.')