Skip to content

Incorporate json store check-graphic usage #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marqh merged 6 commits into from
Oct 4, 2016
Merged

Incorporate json store check-graphic usage #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65fd0d5
Incorporate json store check-graphic usage
bjlittle Oct 4, 2016
19c33ae
Remove expected_fname and add imagerepo uris
bjlittle Oct 4, 2016
bdac68c
Cherry-pick expected hash from uri
bjlittle Oct 4, 2016
a7de297
fix repo lookup
bjlittle Oct 4, 2016
14a76b7
Fix experimental repo keys
bjlittle Oct 4, 2016
e6075ab
Add codecs utf-8 reader for pk3 json load
bjlittle Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions lib/iris/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@
from six.moves import (filter, input, map, range, zip) # noqa
import six

import codecs
import collections
import contextlib
import difflib
import filecmp
import functools
import gzip
import hashlib
import inspect
import json
import io
import logging
import os
Expand Down Expand Up @@ -666,15 +669,12 @@ def check_graphic(self, tol=None):
unique_id = self._unique_id()

figure = plt.gcf()

repo_fname = os.path.join(os.path.dirname(__file__), 'results', 'imagerepo.json')
with open(repo_fname, 'rb') as fi:
repo = json.load(codecs.getreader('utf-8')(fi))

try:
expected_fname = os.path.join(os.path.dirname(__file__),
'results', 'visual_tests',
unique_id + '.png')

if not os.path.isdir(os.path.dirname(expected_fname)):
os.makedirs(os.path.dirname(expected_fname))

#: The path where the images generated by the tests should go.
image_output_directory = os.path.join(os.path.dirname(__file__),
'result_image_comparison')
Expand Down Expand Up @@ -703,24 +703,25 @@ def check_graphic(self, tol=None):

figure.savefig(result_fname)

if not os.path.exists(expected_fname):
warnings.warn('Created image for test %s' % unique_id)
shutil.copy2(result_fname, expected_fname)
# XXX: Deal with a new test result i.e. it's not in the repo

# hash the created image using sha1
import hashlib
with open(result_fname, 'rb') as res_file:
sha1 = hashlib.sha1(res_file.read())

err = ''

with open(expected_fname, 'rb') as exp_file:
exp_sha1 = hashlib.sha1(exp_file.read())
exp_sha1_list = known_sha1_values[unique_id]
if sha1.hexdigest() != exp_sha1.hexdigest():
# if sha1.hexdigest() not in exp_sha1_list:
err = 'Image file SHA1: {}\n not equal to expected SHA1:{}\n '
err = err.format(sha1.hexdigest(), exp_sha1.hexdigest())

# XXX: Deal with more than one expected hash ...
try:
ehash = repo[unique_id][0]
exp_sha1 = os.path.splitext(os.path.basename(ehash))[0]
except KeyError:
emsg = 'Missing image repo entry for "{}"'.format(unique_id)
raise ValueError(emsg)

if sha1.hexdigest() != exp_sha1:
err = 'Actual SHA1 "{}" != expected SHA1 "{}" for test "{}"'
err = err.format(sha1.hexdigest(), exp_sha1, unique_id)

if _DISPLAY_FIGURES:
if err:
Expand Down
Loading