[telemetry] Cleanups for benchmarks importing page sets.

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
@@ skipping 49 matching lines @@
     for page in page_set.pages:
       self.CheckTypesOfPageBasicAttributes(page)
 
   def CheckTypesOfPageSetBasicAttributes(self, page_set):
     if page_set.file_path is not None:
       self.assertTrue(
           isinstance(page_set.file_path, str),
           msg='page_set %\'s file_path must have type string')
 
     self.assertTrue(
-        isinstance(page_set.description, str),
-        msg='page_set\'s description must have type string')
-
-    self.assertTrue(
         isinstance(page_set.archive_data_file, str),
         msg='page_set\'s archive_data_file path must have type string')
 
     if page_set.user_agent_type is not None:
       self.assertTrue(
           isinstance(page_set.user_agent_type, str),
           msg='page_set\'s user_agent_type must have type string')
 
     self.assertTrue(
         isinstance(page_set.make_javascript_deterministic, bool),
         msg='page_set\'s make_javascript_deterministic must have type bool')
 
     self.assertTrue(
         isinstance(page_set.startup_url, str),
         msg='page_set\'s startup_url must have type string')
 
   def CheckTypesOfPageBasicAttributes(self, page):
     self.assertTrue(
        isinstance(page.url, str),
        msg='page %s \'s url must have type string' % page.display_name)
     self.assertTrue(
        isinstance(page.page_set, page_set_module.PageSet),
        msg='page %s \'s page_set must be an instance of '
        'telemetry.page.page_set.PageSet' % page.display_name)
     self.assertTrue(
        isinstance(page.name, str),
        msg='page %s \'s name field must have type string' % page.display_name)
 
-  def RunSmokeTest(self, page_sets_dir):
+  def RunSmokeTest(self, page_sets_dir, top_level_dir):
     """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.GetAllPageSetFilenames(page_sets_dir)
-
-    for page_set_path in page_sets:
-      page_set = page_set_module.PageSet.FromFile(page_set_path)
+    page_sets = discover.DiscoverClasses(page_sets_dir, top_level_dir,
+                                         page_set_module.PageSet).values()
+    for page_set_class in page_sets:
+      page_set = page_set_class()
       logging.info('Testing %s', page_set.file_path)
       self.CheckArchive(page_set)
       self.CheckCredentials(page_set)
       self.CheckTypes(page_set)