From 1b3db78c4451a755eeaadc4cedceccd9e91724c8 Mon Sep 17 00:00:00 2001 From: "chase@chromium.org" Date: Wed, 11 Aug 2010 19:38:45 +0000 Subject: Convert mac10.6/dhtml/times to new expectations format. Update unit tests. BUG=none TEST=mac10.6/dhtml is orange Review URL: http://codereview.chromium.org/3180002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55769 0039d316-1c4b-4281-b951-d872f2087c98 --- .../tests/perf_expectations_unittest.py | 30 ++++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'tools/perf_expectations/tests') diff --git a/tools/perf_expectations/tests/perf_expectations_unittest.py b/tools/perf_expectations/tests/perf_expectations_unittest.py index 88b8251..ffb0e23 100755 --- a/tools/perf_expectations/tests/perf_expectations_unittest.py +++ b/tools/perf_expectations/tests/perf_expectations_unittest.py @@ -105,14 +105,28 @@ class PerfExpectationsUnittest(unittest.TestCase): for key in perf_data: if key == 'load': continue - 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) + + # 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 len(bad_keys) > 0: msg = "perf expectations key values missing or invalid delta/var" raise Exception("%s: %s" % (msg, bad_keys)) -- cgit v1.1