diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-12 20:40:29 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-12 20:40:29 +0000 |
| commit | 68a3815401f461976f76891d0477cb1440fa0aba (patch) | |
| tree | abd64170d74c04b3ee1142937b9b043ce210c9d5 /gm/rebaseline_server/server.py | |
| parent | 87b0094d42eaaccf5c7aba4ad7c31922692abc00 (diff) | |
rename rebaseline_server JSON constants to be more consistent
(no behavioral change, no change to JSON file format)
(SkipBuildbotRuns)
NOTREECHECKS=True
NOTRY=True
R=rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/287473002
git-svn-id: http://skia.googlecode.com/svn/trunk@14701 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/rebaseline_server/server.py')
| -rwxr-xr-x | gm/rebaseline_server/server.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gm/rebaseline_server/server.py b/gm/rebaseline_server/server.py index 73cfbef21e..40874d603f 100755 --- a/gm/rebaseline_server/server.py +++ b/gm/rebaseline_server/server.py @@ -454,9 +454,9 @@ class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): else: now = int(time.time()) response_dict = { - results_mod.KEY__HEADER: { + imagepairset.KEY__ROOT__HEADER: { results_mod.KEY__HEADER__SCHEMA_VERSION: ( - results_mod.REBASELINE_SERVER_SCHEMA_VERSION_NUMBER), + results_mod.VALUE__HEADER__SCHEMA_VERSION), results_mod.KEY__HEADER__IS_STILL_LOADING: True, results_mod.KEY__HEADER__TIME_UPDATED: now, results_mod.KEY__HEADER__TIME_NEXT_UPDATE_AVAILABLE: ( @@ -549,7 +549,8 @@ class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): with _SERVER.results_rlock: oldResultsType = data[KEY__EDITS__OLD_RESULTS_TYPE] oldResults = _SERVER.results.get_results_of_type(oldResultsType) - oldResultsHash = str(hash(repr(oldResults[imagepairset.KEY__IMAGEPAIRS]))) + oldResultsHash = str(hash(repr( + oldResults[imagepairset.KEY__ROOT__IMAGEPAIRS]))) if oldResultsHash != data[KEY__EDITS__OLD_RESULTS_HASH]: raise Exception('results of type "%s" changed while the client was ' 'making modifications. The client should reload the ' |