[telemetry] Fix_profile types and trace_event_importer unit tests.

profile_types was using the wrong base directory for profile type discovery.
trace_event_importer just used asserts that aren't available in Python 2.6.

BUG=254147
TEST=None.
R=tonyg@chromium.org

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

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

5 files changed, 18 insertions, 18 deletions

diff --git a/tools/telemetry/docs/telemetry.core.profile_types.html b/tools/telemetry/docs/telemetry.core.profile_types.html
index 2a14b74..3dddd58 100644
--- a/tools/telemetry/docs/telemetry.core.profile_types.html
+++ b/tools/telemetry/docs/telemetry.core.profile_types.html
@@ -30,7 +30,7 @@
     
 <tr><td bgcolor="#eeaa77"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><dl><dt><a name="-ClearProfieCreatorsForTests"><strong>ClearProfieCreatorsForTests</strong></a>()</dt><dd><tt>Clears&nbsp;the&nbsp;discovered&nbsp;profile&nbsp;creator&nbsp;objects.&nbsp;&nbsp;Used&nbsp;for&nbsp;unit&nbsp;tests.</tt></dd></dl>
- <dl><dt><a name="-FindProfileCreators"><strong>FindProfileCreators</strong></a>(profile_creators_dir)</dt><dd><tt>Discover&nbsp;all&nbsp;the&nbsp;ProfileCreator&nbsp;objects&nbsp;in&nbsp;|profile_creators_dir|.</tt></dd></dl>
+ <dl><dt><a name="-FindProfileCreators"><strong>FindProfileCreators</strong></a>(profile_creators_dir, base_dir)</dt><dd><tt>Discover&nbsp;all&nbsp;the&nbsp;ProfileCreator&nbsp;objects&nbsp;in&nbsp;|profile_creators_dir|.</tt></dd></dl>
  <dl><dt><a name="-GetProfileCreator"><strong>GetProfileCreator</strong></a>(profile_type)</dt><dd><tt>Returns&nbsp;the&nbsp;profile&nbsp;creator&nbsp;object&nbsp;corresponding&nbsp;to&nbsp;the&nbsp;|profile_type|<br>
 string.</tt></dd></dl>
  <dl><dt><a name="-GetProfileDir"><strong>GetProfileDir</strong></a>(profile_type)</dt><dd><tt>Given&nbsp;a&nbsp;|profile_type|&nbsp;(as&nbsp;returned&nbsp;by&nbsp;<a href="#-GetProfileTypes">GetProfileTypes</a>()),&nbsp;return&nbsp;the<br>
diff --git a/tools/telemetry/telemetry/core/profile_types.py b/tools/telemetry/telemetry/core/profile_types.py
index 1ae587c..92a8a77 100644
--- a/tools/telemetry/telemetry/core/profile_types.py
+++ b/tools/telemetry/telemetry/core/profile_types.py
@@ -16,16 +16,15 @@ PROFILE_TYPE_MAPPING = {
   'power_user': 'chrome/test/data/extensions/profiles/extension_webrequest',
 }
 
-def _DiscoverCreateableProfiles(profile_creators_dir):
+def _DiscoverCreateableProfiles(profile_creators_dir, base_dir):
   """Returns a dictionary of all the profile creators we can use to create
   a Chrome profile for testing located in |profile_creators_dir|.
   The returned value consists of 'class_name' -> 'test class' dictionary where
   class_name is the name of the class with the _creator suffix removed e.g.
   'small_profile_creator will be 'small_profile'.
   """
-  profile_creators_unfiltered = (
-      discover.DiscoverClasses(profile_creators_dir, profile_creators_dir,
-          profile_creator.ProfileCreator))
+  profile_creators_unfiltered = discover.DiscoverClasses(
+      profile_creators_dir, base_dir, profile_creator.ProfileCreator)
 
   # Remove '_creator' suffix from keys.
   profile_creators = {}
@@ -40,10 +39,11 @@ def ClearProfieCreatorsForTests():
   """Clears the discovered profile creator objects.  Used for unit tests."""
   PROFILE_CREATORS.clear()
 
-def FindProfileCreators(profile_creators_dir):
+def FindProfileCreators(profile_creators_dir, base_dir):
   """Discover all the ProfileCreator objects in |profile_creators_dir|."""
   assert not PROFILE_CREATORS  # It's illegal to call this function twice.
-  PROFILE_CREATORS.update(_DiscoverCreateableProfiles(profile_creators_dir))
+  PROFILE_CREATORS.update(_DiscoverCreateableProfiles(
+      profile_creators_dir, base_dir))
 
 def GetProfileTypes():
   """Returns a list of all command line options that can be specified for
diff --git a/tools/telemetry/telemetry/core/profile_types_unittest.py b/tools/telemetry/telemetry/core/profile_types_unittest.py
index fc5cb00..3dcab2e 100644
--- a/tools/telemetry/telemetry/core/profile_types_unittest.py
+++ b/tools/telemetry/telemetry/core/profile_types_unittest.py
@@ -5,6 +5,7 @@ import os
 import unittest
 
 from telemetry.core import profile_types
+from telemetry.core import util
 
 class ProfileTypesTest(unittest.TestCase):
   def testGetProfileTypes(self):
@@ -17,10 +18,11 @@ class ProfileTypesTest(unittest.TestCase):
     self.assertFalse(profile_types.GetProfileDir('typical_user') is None)
 
   def testGetProfileCreatorTypes(self):
-    profile_creators_dir = os.path.join(os.path.dirname(__file__), '..', '..',
-        'unittest_data','discoverable_classes')
+    profile_creators_dir = os.path.join(
+        util.GetUnittestDataDir(), 'discoverable_classes')
+    base_dir = util.GetUnittestDataDir()
 
-    profile_types.FindProfileCreators(profile_creators_dir)
+    profile_types.FindProfileCreators(profile_creators_dir, base_dir)
     types = profile_types.GetProfileTypes()
     self.assertTrue(len(types) > 0)
     self.assertTrue('dummy_profile' in types)
diff --git a/tools/telemetry/telemetry/core/timeline/tracing/trace_event_importer_unittest.py b/tools/telemetry/telemetry/core/timeline/tracing/trace_event_importer_unittest.py
index 649ee53a..e1241cc 100644
--- a/tools/telemetry/telemetry/core/timeline/tracing/trace_event_importer_unittest.py
+++ b/tools/telemetry/telemetry/core/timeline/tracing/trace_event_importer_unittest.py
@@ -548,11 +548,9 @@ class TraceEventTimelineImporterTest(unittest.TestCase):
     self.assertEqual(3, ctr.num_samples)
     self.assertEqual(2, ctr.num_series)
 
-    self.assertItemsEqual(['value1', 'value2'], ctr.series_names)
-    self.assertItemsEqual([0, 0.01, 0.02], ctr.timestamps)
-    self.assertItemsEqual([0, 7,
-                       10, 4,
-                       0, 1], ctr.samples)
+    self.assertEqual(sorted(['value1', 'value2']), sorted(ctr.series_names))
+    self.assertEqual(sorted([0, 0.01, 0.02]), sorted(ctr.timestamps))
+    self.assertEqual(sorted([0, 7, 10, 4, 0, 1]), sorted(ctr.samples))
     # We can't check ctr.totals here because it can change depending on
     # the order in which the series names are added.
     self.assertEqual(14, ctr.max_total)
@@ -826,7 +824,7 @@ class TraceEventTimelineImporterTest(unittest.TestCase):
 
     m = timeline_model.TimelineModel(event_data=events)
     t = GetAllProcesses(m)[0].GetThreadWithId(53)
-    self.assertIsNotNone(t)
+    self.assertTrue(t is not None)
 
   def testAsyncStepsMissingFinish(self):
     events = [
@@ -839,7 +837,7 @@ class TraceEventTimelineImporterTest(unittest.TestCase):
 
     m = timeline_model.TimelineModel(event_data=events)
     t = GetAllProcesses(m)[0].GetThreadWithId(53)
-    self.assertIsNotNone(t)
+    self.assertTrue(t is not None)
 
   def testImportSamples(self):
     events = [
diff --git a/tools/telemetry/telemetry/page/page_test_runner.py b/tools/telemetry/telemetry/page/page_test_runner.py
index 2801312..7a1b18a 100644
--- a/tools/telemetry/telemetry/page/page_test_runner.py
+++ b/tools/telemetry/telemetry/page/page_test_runner.py
@@ -127,7 +127,7 @@ class PageTestRunner(object):
 
   def ParseCommandLine(self, args, base_dir, page_set_filenames):
     # Need to collect profile creators before creating command line parser.
-    profile_types.FindProfileCreators(base_dir)
+    profile_types.FindProfileCreators(base_dir, base_dir)
 
     self._options = browser_options.BrowserOptions()
     self._parser = self._options.CreateParser(