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

cleanup postgis async test

Browse source
This commit is contained in:
Dane Springmeyer 2013-09-23 14:52:46 -07:00
parent 75d88f3370
commit 5c020cf28f
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/python_tests/postgis_async_test.py
View file

@ -3,7 +3,7 @@
from nose.tools import * from nose.tools import *
import sys import sys
import time import time
from utilities import execution_path from utilities import execution_path, run_all
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
import os, mapnik import os, mapnik
@ -88,15 +88,15 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
postgis_setup() postgis_setup()
def test_psql_error_should_not_break_connection_pool(): def test_psql_error_should_not_break_connection_pool():
# Bad request, will trig an error when returning result # Bad request, will trigger an error when returning result
ds_bad = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table="""(SELECT geom as geom,label::int from public.test1) as failure_table""", ds_bad = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table="""(SELECT geom as geom,label::int from public.test1) as failure_table""",
max_async_connection=5,geometry_field='geom',srid=4326,trace=False) max_async_connection=5,geometry_field='geom',srid=4326)
# Good request # Good request
ds_good = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table="test1", ds_good = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table="test1",
max_async_connection=5,geometry_field='geom',srid=4326,trace=False) max_async_connection=5,geometry_field='geom',srid=4326)
# This will/should trig a PSQL error # This will/should trigger a PSQL error
failed = False failed = False
try: try:
fs = ds_bad.featureset() fs = ds_bad.featureset()
@ -110,9 +110,7 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
# Should be ok # Should be ok
fs = ds_good.featureset() fs = ds_good.featureset()
for feature in fs: for feature in fs:
pass pass
if __name__ == "__main__": if __name__ == "__main__":
setup() setup()