Index: tools/telemetry/telemetry/user_story/user_story_runner.py |
diff --git a/tools/telemetry/telemetry/user_story/user_story_runner.py b/tools/telemetry/telemetry/user_story/user_story_runner.py |
index 695c114f92ac8adb182d89326b1f901c92ac9138..39ac8297d936b1c3bc12236e1cf9d448d00fbfb1 100644 |
--- a/tools/telemetry/telemetry/user_story/user_story_runner.py |
+++ b/tools/telemetry/telemetry/user_story/user_story_runner.py |
@@ -9,7 +9,6 @@ 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 util |
@@ -20,7 +19,6 @@ from telemetry.page import shared_page_state |
from telemetry.page.actions import page_action |
from telemetry.results import results_options |
from telemetry.user_story import user_story_filter |
-from telemetry.util import cloud_storage |
from telemetry.util import exception_formatter |
from telemetry.value import failure |
from telemetry.value import skip |
@@ -119,28 +117,6 @@ def _RunUserStoryAndProcessErrorIfNeeded(expectations, user_story, results, |
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 |
@@ -205,7 +181,7 @@ def Run(test, user_story_set, expectations, finder_options, results, |
if (not finder_options.use_live_sites and |
finder_options.browser_options.wpr_mode != wpr_modes.WPR_RECORD): |
- _UpdateUserStoryArchivesIfChanged(user_story_set) |
+ user_story_set.UpdateServingDirDataIfNeeded() |
if not _UpdateAndCheckArchives( |
user_story_set.archive_data_file, user_story_set.wpr_archive_info, |
user_stories): |