Better error messages on archive failures, and stop running with partial page sets in user_story_ru…

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 187 matching lines @@
 
   # 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 and
       # TODO(nednguyen): also handle these logic for user_story_set in next
       # patch.
       isinstance(user_story_set, page_set_module.PageSet)):
     _UpdateUserStoryArchivesIfChanged(user_story_set)
-    user_stories = _CheckArchives(user_story_set, user_stories, results)
+    user_stories = _CheckArchives(user_story_set, user_stories)
 
   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'))
       results.DidRunPage(user_story)
       user_stories.remove(user_story)
 
@@ skipping 53 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(page_set, pages, results):
+def _CheckArchives(page_set, pages):
   """Returns a subset of pages that are local or have WPR archives.
 
   Logs warnings if any are missing.
   """
-  # Warn of any problems with the entire page set.
+  # Error if there are any problems with the entire page set.
   if any(not p.is_local for p in pages):
     if not page_set.archive_data_file:
-      logging.warning('The page set is missing an "archive_data_file" '
-                      'property. Skipping any live sites. To include them, '
-                      'pass the flag --use-live-sites.')
+      logging.error('The page set is missing an "archive_data_file" '
+                    'property. To run from live sites pass the flag '
+                    '--use-live-sites. To create an archive file add an '
+                    'archive_data_file property to the page set and then '
+                    'run record_wpr.')
+      raise Exception('No archive_data_file for page set.')

[dtu, 2014/11/22 00:48:29]

nit: raise some other kind of Error, not a generic Exception.

     if not page_set.wpr_archive_info:
-      logging.warning('The archive info file is missing. '
-                      'To fix this, either add svn-internal to your '
-                      '.gclient using http://goto/read-src-internal, '
-                      'or create a new archive using record_wpr.')
+      logging.error('The archive info file is missing. '
+                    'To fix this, either add svn-internal to your '
+                    '.gclient using http://goto/read-src-internal, '
+                    'or create a new archive using record_wpr.')
+      raise Exception('No wpr_archive_info for page set.')
 
-  # Warn of any problems with individual pages and return valid pages.
+  # Warn of any problems with individual pages and either throw an error or
+  # return valid pages.
   pages_missing_archive_path = []
   pages_missing_archive_data = []
   valid_pages = []
   for page in pages:
     if not page.is_local and not page.archive_path:
       pages_missing_archive_path.append(page)
     elif not page.is_local and not os.path.isfile(page.archive_path):
       pages_missing_archive_data.append(page)
     else:
       valid_pages.append(page)
   if pages_missing_archive_path:
-    logging.warning('The page set archives for some pages do not exist. '
-                    'Skipping those pages. To fix this, record those pages '
-                    'using record_wpr. To ignore this warning and run '
-                    'against live sites, pass the flag --use-live-sites.')
+    logging.error('The page set archives for some pages do not exist. '
+                  'To fix this, record those pages using record_wpr. '
+                  'To ignore this warning and run against live sites, '
+                  'pass the flag --use-live-sites.')
+    logging.error(
+        'Pages without archives: %s',
+        ', '.join(page.display_name for page in pages_missing_archive_path))
   if pages_missing_archive_data:
-    logging.warning('The page set archives for some pages are missing. '
-                    'Someone forgot to check them in, or they were deleted. '
-                    'Skipping those pages. To fix this, record those pages '
-                    'using record_wpr. To ignore this warning and run '
-                    'against live sites, pass the flag --use-live-sites.')
-  for page in pages_missing_archive_path + pages_missing_archive_data:
-    results.WillRunPage(page)
-    results.AddValue(failure.FailureValue.FromMessage(
-        page, 'Page set archive doesn\'t exist.'))
-    results.DidRunPage(page)
+    logging.error('The page set archives for some pages are missing. '
+                  'Someone forgot to check them in, uploaded them to the '
+                  'wrong cloud storage bucket, or they were deleted. '
+                  'To fix this, record those pages using record_wpr. '
+                  'To ignore this warning and run against live sites, '
+                  'pass the flag --use-live-sites.')
+    logging.error(
+        'Pages missing archives: %s',
+        ', '.join(page.display_name for page in pages_missing_archive_data))
+  if pages_missing_archive_path or pages_missing_archive_data:
+    raise Exception('Missing archives for some pages in page set.')
   return valid_pages
 
 
 def _WaitForThermalThrottlingIfNeeded(platform):
   if not platform.CanMonitorThermalThrottling():
     return
   thermal_throttling_retry = 0
   while (platform.IsThermallyThrottled() and
          thermal_throttling_retry < 3):
     logging.warning('Thermally throttled, waiting (%d)...',
                     thermal_throttling_retry)
     thermal_throttling_retry += 1
     time.sleep(thermal_throttling_retry * 2)
 
   if thermal_throttling_retry and platform.IsThermallyThrottled():
     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.')