Make credential_path a page attribute instead of page_set attribute.

tools/telemetry/telemetry/unittest/page_set_smoke_test.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 os
 import unittest
 
 from telemetry.core import browser_credentials
 from telemetry.core import discover
 from telemetry.page import page_set as page_set_module
 from telemetry.page import page_set_archive_info
+from telemetry.util import classes
 
 
 class PageSetSmokeTest(unittest.TestCase):
 
   def CheckArchive(self, page_set):
     """Verify that all URLs of pages in page_set have an associated archive. """
     # TODO: Eventually these should be fatal.
     if not page_set.archive_data_file:
       logging.warning('Skipping %s: no archive data file', page_set.file_path)
       return
@@ skipping 10 matching lines @@
         archive_data_file_path, ignore_archive=True)
     for page in page_set.pages:
       if not page.url.startswith('http'):
         continue
       self.assertTrue(wpr_archive_info.WprFilePathForPage(page),
                       msg='No archive found for %s in %s' % (
                           page.url, page_set.archive_data_file))
 
   def CheckCredentials(self, page_set):
     """Verify that all pages in page_set use proper credentials"""
-    credentials = browser_credentials.BrowserCredentials()
-    if page_set.credentials_path:
-      credentials.credentials_path = (
-          os.path.join(page_set.base_dir, page_set.credentials_path))
     for page in page_set.pages:
+      credentials = browser_credentials.BrowserCredentials()
+      if page.credentials_path:
+        credentials.credentials_path = (
+            os.path.join(page.base_dir, page.credentials_path))
       fail_message = ('page %s of %s has invalid credentials %s' %
                       (page.url, page_set.file_path, page.credentials))
       if page.credentials:
         try:
           self.assertTrue(credentials.CanLogin(page.credentials), fail_message)
         except browser_credentials.CredentialsError:
           self.fail(fail_message)
 
   def CheckAttributes(self, page_set):
     """Verify that page_set and its page's base attributes have the right types.
@@ skipping 42 matching lines @@
     """Run smoke test on all page sets in page_sets_dir.
 
     Subclass of PageSetSmokeTest is supposed to call this in some test
     method to run smoke test.
     """
     page_sets = discover.DiscoverClasses(page_sets_dir, top_level_dir,
                                          page_set_module.PageSet).values()
     for page_set_class in page_sets:
       try:
         page_set = page_set_class()
       except TypeError:

[dtu, 2014/10/06 21:30:22]

What is this except block for in the first place? I just ran perf and gpu unit
tests without it, and they still pass.

[nednguyen, 2014/10/07 20:11:09]

There are some page_set that aren't directly constructable in perf/internal. I
guess Tony added this except to ignore them all. 
However, when I remove credentials_path argument from PageSet.__init__, this try
catch block make this test still pass even if I don't remove the
crendentials_path call in super(PageSetX, self).__init__(...)

[dtu, 2014/10/08 21:34:18]

Interesting, okay.

+        if classes.IsDirectlyConstructable(page_set_class):
+          raise
         continue
       logging.info('Testing %s', page_set.file_path)
       self.CheckArchive(page_set)
       self.CheckCredentials(page_set)
       self.CheckAttributes(page_set)