Revert "Convert mac10.6/dhtml/times to new expectations format."

tools/perf_expectations/tests/perf_expectations_unittest.py

 #!/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
@@ skipping 87 matching lines @@
       if not isinstance(perf_data[key], dict):
         bad_keys.append(key)
     if len(bad_keys) > 0:
       msg = "perf expectations keys have non-dict values"
       raise Exception("%s: %s" % (msg, bad_keys))
 
     # Test all key values have delta and var keys.
     for key in perf_data:
       if key == 'load':
         continue
-
-      # First check if regress/improve is in the key's data.
-      if 'regress' in perf_data[key]:
-        if 'improve' not in perf_data[key]:
-          bad_keys.append(key)
-        if (not isinstance(perf_data[key]['regress'], int) and
-            not isinstance(perf_data[key]['regress'], float)):
-          bad_keys.append(key)
-        if (not isinstance(perf_data[key]['improve'], int) and
-            not isinstance(perf_data[key]['improve'], float)):
-          bad_keys.append(key)
-      else:
-        # Otherwise check if delta/var is in the key's data.
-        if 'delta' not in perf_data[key] or 'var' not in perf_data[key]:
-          bad_keys.append(key)
-        if (not isinstance(perf_data[key]['delta'], int) and
-            not isinstance(perf_data[key]['delta'], float)):
-          bad_keys.append(key)
-        if (not isinstance(perf_data[key]['var'], int) and
-            not isinstance(perf_data[key]['var'], float)):
-          bad_keys.append(key)
-
+      if 'delta' not in perf_data[key] or 'var' not in perf_data[key]:
+        bad_keys.append(key)
+      if (not isinstance(perf_data[key]['delta'], int) and
+          not isinstance(perf_data[key]['delta'], float)):
+        bad_keys.append(key)
+      if (not isinstance(perf_data[key]['var'], int) and
+          not isinstance(perf_data[key]['var'], float)):
+        bad_keys.append(key)
     if len(bad_keys) > 0:
       msg = "perf expectations key values missing or invalid delta/var"
       raise Exception("%s: %s" % (msg, bad_keys))
 
     # Test all keys have the correct format.
     for key in perf_data:
       if key == 'load':
         continue
       # tools/buildbot/scripts/master/log_parser.py should have a matching
       # regular expression.
       if not re.match(r"^([\w\.-]+)/([\w\.-]+)/([\w\.-]+)/([\w\.-]+)$", key):
         bad_keys.append(key)
     if len(bad_keys) > 0:
       msg = "perf expectations keys in bad format, expected a/b/c/d"
       raise Exception("%s: %s" % (msg, bad_keys))
 
 if __name__ == '__main__':
   unittest.main()