sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

skip tests in save_map_test.py that use unavailable input plugins

Browse source
This commit is contained in:
Eric Stadtherr 2016-07-08 13:19:15 -06:00
parent e0616bd5ab
commit 7f506ff5cf
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
run_tests
View file

@ -8,7 +8,7 @@ failures=$((failures+$?))
echo "*** Running C++ tests..."
for FILE in tests/cpp_tests/*-bin; do
${FILE} -q -d .;
${FILE} -q -d .;
failures=$((failures+$?))
done

26
tests/python_tests/save_map_test.py
View file

@ -5,16 +5,32 @@ from utilities import execution_path, run_all
import tempfile
import os, sys, glob, mapnik
from xml.etree import ElementTree
def setup():
# All of the paths used are relative, if we run the tests
# from another directory we need to chdir()
os.chdir(execution_path('.'))
def compare_map(xml):
def compare_map(xmlfile):
have_inputs = True
missing_plugins = set()
e = ElementTree.parse(xmlfile)
data_source_type_params = e.findall(".//Layer/Datasource/Parameter[@name=\"type\"]")
if data_source_type_params is not None and len(data_source_type_params) > 0:
for p in data_source_type_params:
dstype = p.text
if dstype not in mapnik.DatasourceCache.plugin_names():
have_inputs = False
missing_plugins.add(dstype)
if not have_inputs:
print 'Notice: skipping map comparison for %s due to missing input plugins: %s' % (os.path.basename(xmlfile), list(missing_plugins))
return False
m = mapnik.Map(256, 256)
absolute_base = os.path.abspath(os.path.dirname(xml))
mapnik.load_map(m, xml, False, absolute_base)
absolute_base = os.path.abspath(os.path.dirname(xmlfile))
mapnik.load_map(m, xmlfile, False, absolute_base)
(handle, test_map) = tempfile.mkstemp(suffix='.xml', prefix='mapnik-temp-map1-')
os.close(handle)
(handle, test_map2) = tempfile.mkstemp(suffix='.xml', prefix='mapnik-temp-map2-')
@ -23,13 +39,13 @@ def compare_map(xml):
os.remove(test_map)
mapnik.save_map(m, test_map)
new_map = mapnik.Map(256, 256)
mapnik.load_map(new_map, test_map,False,absolute_base)
mapnik.load_map(new_map, test_map, False, absolute_base)
open(test_map2,'w').write(mapnik.save_map_to_string(new_map))
diff = ' diff %s %s' % (os.path.abspath(test_map),os.path.abspath(test_map2))
try:
eq_(open(test_map).read(),open(test_map2).read())
except AssertionError, e:
raise AssertionError('serialized map "%s" not the same after being reloaded, \ncompare with command:\n\n$%s' % (xml,diff))
raise AssertionError('serialized map "%s" not the same after being reloaded, \ncompare with command:\n\n$%s' % (xmlfile, diff))
if os.path.exists(test_map):
os.remove(test_map)