tests: lessen strictness of cairo comparison tests so that files created on ubuntu saucy/os x pass on ubuntu precise - refs #1868

This commit is contained in:
Dane Springmeyer 2013-10-28 14:18:44 -07:00
parent 535dc0da3f
commit a5926e70b2
2 changed files with 2 additions and 2 deletions

View file

@ -163,7 +163,7 @@ if mapnik.has_pycairo():
shutil.copy(test_cairo_file,expected_cairo_file) shutil.copy(test_cairo_file,expected_cairo_file)
diff = abs(os.stat(expected_cairo_file).st_size-os.stat(test_cairo_file).st_size) diff = abs(os.stat(expected_cairo_file).st_size-os.stat(test_cairo_file).st_size)
msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff,test_cairo_file,'tests/python_tests/'+ expected_cairo_file) msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff,test_cairo_file,'tests/python_tests/'+ expected_cairo_file)
eq_( diff < 1500, True, msg) eq_( diff < 2100, True, msg)
os.remove(test_cairo_file) os.remove(test_cairo_file)
return True return True
else: else:

View file

@ -30,7 +30,7 @@ if 'Linux' == os.uname()[0]:
# which is older than the 1.12.14 version we used on OS X # which is older than the 1.12.14 version we used on OS X
# to generate the expected images, so we'll rachet back the threshold # to generate the expected images, so we'll rachet back the threshold
# https://github.com/mapnik/mapnik/issues/1868 # https://github.com/mapnik/mapnik/issues/1868
cairo_threshold = 120 cairo_threshold = 181
def render_cairo(m, output, scale_factor): def render_cairo(m, output, scale_factor):
mapnik.render_to_file(m, output, 'ARGB32', scale_factor) mapnik.render_to_file(m, output, 'ARGB32', scale_factor)