diff options
| author |  epoger <epoger@google.com> | 2014-07-11 08:52:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-11 08:52:35 -0700 |
| commit | 133931f4abdafa5bb0bdea3a02af1e5a70d5ac98 (patch) | |
| tree | 35453b87e8ca21cc2108fa27eee932c91e50fe62 /gm/rebaseline_server/compare_configs.py | |
| parent | 3a21d61668e0ac6529f9930669dd47be123ec333 (diff) | |
roll "common" DEPS, and replace tools/pyutils with it
BUG=skia:2682
R=borenet@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/385783002
Diffstat (limited to 'gm/rebaseline_server/compare_configs.py')
| -rwxr-xr-x | gm/rebaseline_server/compare_configs.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gm/rebaseline_server/compare_configs.py b/gm/rebaseline_server/compare_configs.py index 4075da4263..cdc19dd831 100755 --- a/gm/rebaseline_server/compare_configs.py +++ b/gm/rebaseline_server/compare_configs.py @@ -11,15 +11,14 @@ Compare GM results for two configs, across all builders. # System-level imports import argparse -import fnmatch -import json import logging -import re import time +# Must fix up PYTHONPATH before importing from within Skia +import fix_pythonpath # pylint: disable=W0611 + # Imports from within Skia -import fix_pythonpath # must do this first -from pyutils import url_utils +from py.utils import url_utils import gm_json import imagediffdb import imagepair @@ -112,7 +111,7 @@ class ConfigComparisons(results.BaseComparisons): tests_found = set() for image_name in sorted(results_of_this_type.keys()): - (test, config) = results.IMAGE_FILENAME_RE.match(image_name).groups() + (test, _) = results.IMAGE_FILENAME_RE.match(image_name).groups() tests_found.add(test) for test in tests_found: @@ -160,9 +159,10 @@ class ConfigComparisons(results.BaseComparisons): failing_image_pairs.add_image_pair(image_pair) except (KeyError, TypeError): logging.exception( - 'got exception while creating ImagePair for image_name ' - '"%s", builder "%s"' % (image_name, builder)) + 'got exception while creating ImagePair for test ' + '"%s", builder "%s"' % (test, builder)) + # pylint: disable=W0201 self._results = { results.KEY__HEADER__RESULTS_ALL: all_image_pairs.as_dict(), results.KEY__HEADER__RESULTS_FAILURES: failing_image_pairs.as_dict(), |