test cleanups
This commit is contained in:
parent
62983ef214
commit
2701f93a04
10 changed files with 4 additions and 12 deletions
|
@ -3,7 +3,7 @@
|
||||||
import os
|
import os
|
||||||
import mapnik
|
import mapnik
|
||||||
from nose.tools import *
|
from nose.tools import *
|
||||||
from utilities import execution_path,Todo
|
from utilities import execution_path
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
# All of the paths used are relative, if we run the tests
|
# All of the paths used are relative, if we run the tests
|
||||||
|
|
|
@ -54,7 +54,7 @@ def test_shapefile_polygon_feature_query_id():
|
||||||
compare_shape_between_mapnik_and_ogr('../data/shp/world_merc.shp',query)
|
compare_shape_between_mapnik_and_ogr('../data/shp/world_merc.shp',query)
|
||||||
|
|
||||||
def test_feature_hit_count():
|
def test_feature_hit_count():
|
||||||
raise Todo("need to optimize multigeom bbox handling in shapeindex")
|
raise Todo("need to optimize multigeom bbox handling in shapeindex: https://github.com/mapnik/mapnik/issues/783")
|
||||||
# results in different results between shp and ogr!
|
# results in different results between shp and ogr!
|
||||||
#bbox = (-14284551.8434, 2074195.1992, -7474929.8687, 8140237.7628)
|
#bbox = (-14284551.8434, 2074195.1992, -7474929.8687, 8140237.7628)
|
||||||
bbox = (1113194.91,4512803.085,2226389.82,6739192.905)
|
bbox = (1113194.91,4512803.085,2226389.82,6739192.905)
|
||||||
|
|
|
@ -5,7 +5,6 @@ from nose.tools import *
|
||||||
|
|
||||||
import mapnik
|
import mapnik
|
||||||
from binascii import unhexlify
|
from binascii import unhexlify
|
||||||
from utilities import Todo
|
|
||||||
|
|
||||||
class FeatureTest(unittest.TestCase):
|
class FeatureTest(unittest.TestCase):
|
||||||
def makeOne(self, *args, **kw):
|
def makeOne(self, *args, **kw):
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
from nose.tools import *
|
from nose.tools import *
|
||||||
from utilities import Todo
|
|
||||||
|
|
||||||
import mapnik
|
import mapnik
|
||||||
|
|
||||||
if hasattr(mapnik,'Expression'):
|
if hasattr(mapnik,'Expression'):
|
||||||
|
|
|
@ -6,7 +6,6 @@ import os, mapnik
|
||||||
from timeit import Timer, time
|
from timeit import Timer, time
|
||||||
from nose.tools import *
|
from nose.tools import *
|
||||||
from utilities import execution_path
|
from utilities import execution_path
|
||||||
from utilities import Todo
|
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
# All of the paths used are relative, if we run the tests
|
# All of the paths used are relative, if we run the tests
|
|
@ -3,7 +3,6 @@
|
||||||
import os
|
import os
|
||||||
from nose.tools import *
|
from nose.tools import *
|
||||||
from utilities import execution_path
|
from utilities import execution_path
|
||||||
from utilities import Todo
|
|
||||||
|
|
||||||
import mapnik
|
import mapnik
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
import itertools
|
import itertools
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from utilities import Todo
|
|
||||||
|
|
||||||
class MemoryDatasource(unittest.TestCase):
|
class MemoryDatasource(unittest.TestCase):
|
||||||
ids = itertools.count(0)
|
ids = itertools.count(0)
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
from nose.tools import *
|
from nose.tools import *
|
||||||
|
|
||||||
from utilities import execution_path, Todo
|
from utilities import execution_path
|
||||||
|
|
||||||
import os, sys, glob, mapnik
|
import os, sys, glob, mapnik
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
from nose.tools import *
|
from nose.tools import *
|
||||||
|
|
||||||
import os, mapnik
|
import os, mapnik
|
||||||
from utilities import Todo
|
|
||||||
try:
|
try:
|
||||||
import json
|
import json
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|
|
@ -6,7 +6,6 @@ import tempfile
|
||||||
import os, mapnik
|
import os, mapnik
|
||||||
from nose.tools import *
|
from nose.tools import *
|
||||||
from utilities import execution_path
|
from utilities import execution_path
|
||||||
from utilities import Todo
|
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
# All of the paths used are relative, if we run the tests
|
# All of the paths used are relative, if we run the tests
|
||||||
|
|
Loading…
Reference in a new issue