Refactor downloading archives in archive_info.py

tools/telemetry/telemetry/user_story/user_story_runner_unittest.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 unittest
 import StringIO
 import sys
 
 from telemetry import benchmark
 from telemetry import user_story
@@ skipping 390 matching lines @@
       results.PrintSummary()
       contents = output.getvalue()
       self.assertEquals(4, GetNumberOfSuccessfulPageRuns(results))
       self.assertEquals(0, len(results.failures))
       self.assertIn('RESULT metric: blank= [1,3] unit', contents)
       self.assertIn('RESULT metric: green= [2,4] unit', contents)
       self.assertIn('*RESULT metric: metric= [1,2,3,4] unit', contents)
     finally:
       sys.stdout = real_stdout
 
-  def testCheckArchives(self):
+  def testUpdateAndCheckArchives(self):
     uss = user_story_set.UserStorySet()
     uss.AddUserStory(page_module.Page(
         'http://www.testurl.com', uss, uss.base_dir))
     # Page set missing archive_data_file.
-    self.assertFalse(user_story_runner._CheckArchives(
+    self.assertFalse(user_story_runner._UpdateAndCheckArchives(
         uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
 
     uss = user_story_set.UserStorySet(
         archive_data_file='missing_archive_data_file.json')
     uss.AddUserStory(page_module.Page(
         'http://www.testurl.com', uss, uss.base_dir))
     # Page set missing json file specified in archive_data_file.
-    self.assertFalse(user_story_runner._CheckArchives(
+    self.assertFalse(user_story_runner._UpdateAndCheckArchives(
         uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
 
     uss = user_story_set.UserStorySet(
         archive_data_file='../../unittest_data/test.json',
         cloud_storage_bucket=cloud_storage.PUBLIC_BUCKET)
     uss.AddUserStory(page_module.Page(
         'http://www.testurl.com', uss, uss.base_dir))
     # Page set with valid archive_data_file.
-    self.assertTrue(user_story_runner._CheckArchives(
+    self.assertTrue(user_story_runner._UpdateAndCheckArchives(
         uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
     uss.AddUserStory(page_module.Page(
         'http://www.google.com', uss, uss.base_dir))
     # Page set with an archive_data_file which exists but is missing a page.
-    self.assertFalse(user_story_runner._CheckArchives(
+    self.assertFalse(user_story_runner._UpdateAndCheckArchives(
         uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
 
     uss = user_story_set.UserStorySet(
         archive_data_file='../../unittest_data/test_missing_wpr_file.json',
         cloud_storage_bucket=cloud_storage.PUBLIC_BUCKET)
     uss.AddUserStory(page_module.Page(
         'http://www.testurl.com', uss, uss.base_dir))
     uss.AddUserStory(page_module.Page(
         'http://www.google.com', uss, uss.base_dir))
     # Page set with an archive_data_file which exists and contains all pages
     # but fails to find a wpr file.
-    self.assertFalse(user_story_runner._CheckArchives(
+    self.assertFalse(user_story_runner._UpdateAndCheckArchives(
         uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
 
 
   def _testMaxFailuresOptionIsRespectedAndOverridable(
       self, num_failing_user_stories, runner_max_failures, options_max_failures,
       expected_num_failures):
     class SimpleSharedUserStoryState(
         shared_user_story_state.SharedUserStoryState):
       _fake_platform = FakePlatform()
       _current_user_story = None
@@ skipping 62 matching lines @@
         num_failing_user_stories=5, runner_max_failures=3,
         options_max_failures=None, expected_num_failures=4)
 
   def testMaxFailuresOption(self):
     # Runs up to max_failures+1 failing tests before stopping, since
     # every tests after max_failures failures have been encountered
     # may all be passing.
     self._testMaxFailuresOptionIsRespectedAndOverridable(
         num_failing_user_stories=5, runner_max_failures=3,
         options_max_failures=1, expected_num_failures=2)