Refactor serving_dirs.

tools/telemetry/telemetry/user_story/user_story_set.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 inspect
 import os
 
 from telemetry import user_story as user_story_module
 from telemetry.wpr import archive_info
 
 
 class UserStorySet(object):
   """A collection of user story.
 
   A typical usage of UserStorySet would be to subclass it and then calling
   AddUserStory for each UserStory..
   """
 
   def __init__(self, archive_data_file='', cloud_storage_bucket=None,
                serving_dirs=None):
     """Creates a new UserStorySet.
 
     Args:
       archive_data_file: The path to Web Page Replay's archive data, relative
           to self.base_dir.
       cloud_storage_bucket: The cloud storage bucket used to download
           Web Page Replay's archive data. Valid values are: None,
           PUBLIC_BUCKET, PARTNER_BUCKET, or INTERNAL_BUCKET (defined
           in telemetry.util.cloud_storage).
+      serving_dirs: A set of paths, relative to self.base_dir, to directories
+          containing hash files for non-wpr archive data stored in cloud
+          storage.
     """
     self.user_stories = []
     self._archive_data_file = archive_data_file
     self._wpr_archive_info = None
     archive_info.AssertValidCloudStorageBucket(cloud_storage_bucket)
     self._cloud_storage_bucket = cloud_storage_bucket
     self._base_dir = os.path.dirname(inspect.getfile(self.__class__))
     # Convert any relative serving_dirs to absolute paths.
     self._serving_dirs = set(os.path.realpath(os.path.join(self.base_dir, d))
                              for d in serving_dirs or [])
 
   @property
   def base_dir(self):
     """The base directory to resolve archive_data_file.
 
     This defaults to the directory containing the UserStorySet instance's class.
     """
     return self._base_dir
 
   @property
   def serving_dirs(self):
-    return self._serving_dirs
+    all_serving_dirs = self._serving_dirs.copy()
+    for user_story in self.user_stories:
+      if user_story.serving_dir:
+        all_serving_dirs.add(user_story.serving_dir)
+    return all_serving_dirs
 
   @property
   def archive_data_file(self):
     return self._archive_data_file
 
   @property
   def bucket(self):
     return self._cloud_storage_bucket
 
   @property
@@ skipping 50 matching lines @@
     return self.user_stories.__iter__()
 
   def __len__(self):
     return len(self.user_stories)
 
   def __getitem__(self, key):
     return self.user_stories[key]
 
   def __setitem__(self, key, value):
     self.user_stories[key] = value