Add more unit tests for perf expectations....

log_parser/perf_expectations/tests/simplejson_unittest.py

Index: log_parser/perf_expectations/tests/simplejson_unittest.py
===================================================================
--- log_parser/perf_expectations/tests/simplejson_unittest.py	(revision 25340)
+++ log_parser/perf_expectations/tests/simplejson_unittest.py	(working copy)
@@ -1,81 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2009 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.
-
-"""Verify perf_expectations.json can be loaded using simplejson.
-
-perf_expectations.json is a JSON-formatted file.  This script verifies
-that simplejson can load it correctly.  It should catch most common
-formatting problems.
-"""
-
-import sys
-import os
-import unittest
-
-simplejson = None
-
-def OnTestsLoad():
-  old_path = sys.path
-  script_path = os.path.dirname(sys.argv[0])
-  load_path = None
-  global simplejson
-
-  # This test script should be stored in src/tools/perf_expectations/.  That
-  # directory will most commonly live in 2 locations:
-  #
-  #   - a regular Chromium checkout, in which case src/third_party
-  #     is where to look for simplejson
-  #
-  #   - a buildbot checkout, in which case .../pylibs is where
-  #     to look for simplejson
-  #
-  # Locate and install the correct path based on what we can find.
-  #
-  for path in ('../../../third_party', '../../../../../pylibs'):
-    path = os.path.join(script_path, path)
-    if os.path.exists(path) and os.path.isdir(path):
-      load_path = os.path.abspath(path)
-      break
-
-  if load_path is None:
-    msg = "%s expects to live within a Chromium checkout" % sys.argv[0]
-    raise Exception, "Error locating simplejson load path (%s)" % msg
-
-  # Try importing simplejson once.  If this succeeds, we found it and will
-  # load it again later properly.  Fail if we cannot load it.
-  sys.path.append(load_path)
-  try:
-    import simplejson as Simplejson
-    simplejson = Simplejson
-  except ImportError, e:
-    msg = "%s expects to live within a Chromium checkout" % sys.argv[0]
-    raise Exception, "Error trying to import simplejson from %s (%s)" % \
-                     (load_path, msg)
-  finally:
-    sys.path = old_path
-  return True
-
-OnTestsLoad()
-
-PERF_EXPECTATIONS = os.path.join(os.path.dirname(sys.argv[0]),
-                                 '../perf_expectations.json')
-
-class SimplejsonUnittest(unittest.TestCase):
-  def testFormat(self):
-    perf_file = open(PERF_EXPECTATIONS, 'r')
-    try:
-      perf_data = simplejson.load(perf_file)
-    except ValueError, e:
-      perf_file.seek(0)
-      print "Error reading %s:\n%s" % (PERF_EXPECTATIONS,
-                                      perf_file.read()[:50]+'...')
-      raise e
-    print ("Successfully loaded perf_expectations: %d keys found." %
-           len(perf_data))
-    return
-
-if __name__ == '__main__':
-  unittest.main()