[telemetry] Remove archive check in PageSetArchiveInfo.

There's already a robust check in page_runner. The extra check is messing up record_wpr.


BUG=333609
TEST=mv ~/.boto ~/.boto.bak; rm tools/perf/page_sets/data/top_10_000.wpr; tools/perf/record_wpr page_sets/top_10.json; mv ~/.boto.bak ~/.boto

Review URL: https://codereview.chromium.org/140293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245287 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 16 deletions

diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py
index 5a76192..c870a3e 100644
--- a/tools/telemetry/telemetry/page/page_runner.py
+++ b/tools/telemetry/telemetry/page/page_runner.py
@@ -38,7 +38,7 @@ class _RunState(object):
     self.repeat_state = None
 
   def StartBrowserIfNeeded(self, test, page_set, page, possible_browser,
-                   credentials_path, archive_path):
+                           credentials_path, archive_path):
     started_browser = not self.browser
     # Create a browser.
     if not self.browser:
diff --git a/tools/telemetry/telemetry/page/page_set.py b/tools/telemetry/telemetry/page/page_set.py
index 7c0f1d7..1a84f4e 100644
--- a/tools/telemetry/telemetry/page/page_set.py
+++ b/tools/telemetry/telemetry/page/page_set.py
@@ -68,8 +68,8 @@ class PageSet(object):
         all_serving_dirs.add(page.serving_dir)
     # Scan all serving dirs.
     for serving_dir in all_serving_dirs:
-      if serving_dir == '/':
-        raise ValueError('Trying to serve "/" from HTTP server.')
+      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(
diff --git a/tools/telemetry/telemetry/page/page_set_archive_info.py b/tools/telemetry/telemetry/page/page_set_archive_info.py
index 1a6aeaf..aada2a8 100644
--- a/tools/telemetry/telemetry/page/page_set_archive_info.py
+++ b/tools/telemetry/telemetry/page/page_set_archive_info.py
@@ -7,7 +7,6 @@ import logging
 import os
 import re
 import shutil
-import sys
 
 from telemetry.page import cloud_storage
 
@@ -27,21 +26,12 @@ class PageSetArchiveInfo(object):
       try:
         cloud_storage.GetIfChanged(archive_path)
       except (cloud_storage.CredentialsError,
-              cloud_storage.PermissionError) as e:
+              cloud_storage.PermissionError):
         if os.path.exists(archive_path):
           # If the archive exists, assume the user recorded their own and
           # simply warn.
-          logging.warning('Could not download WPR archive: %s', archive_path)
-        else:
-          # If the archive doesn't exist, this is fatal.
-          logging.error('Can not run without required WPR archive: %s. '
-                        'If you believe you have credentials, follow the '
-                        'instructions below. If you do not have credentials, '
-                        'you may use record_wpr to make your own recording or '
-                        'run against live sites with --allow-live-sites.',
-                        archive_path)
-          logging.error(e)
-          sys.exit(1)
+          logging.warning('Need credentials to update WPR archive: %s',
+                          archive_path)
 
     # Map from the relative path (as it appears in the metadata file) of the
     # .wpr file to a list of urls it supports.