From e35b7825cef65339446c0f230a866a9af7200575 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Fri, 7 Oct 2016 20:27:04 +0000 Subject: [PATCH 1/2] adding testpoints for FR, Guayane, and CA --- src/python/test/autotest.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/python/test/autotest.py b/src/python/test/autotest.py index 356039d..a1d1961 100644 --- a/src/python/test/autotest.py +++ b/src/python/test/autotest.py @@ -115,6 +115,24 @@ def default_point(column_id): return 'ST_SetSRID(ST_MakePoint(-79.39716339111328, 43.65694347778308), 4326)' elif column_id.startswith('th.'): return 'ST_SetSRID(ST_MakePoint(100.49263000488281, 13.725377712079784), 4326)' + # cols for French Guyana only + elif column_id in ('fr.insee.P12_RP_CHOS', 'fr.insee.P12_RP_HABFOR' + , 'fr.insee.P12_RP_EAUCH', 'fr.insee.P12_RP_BDWC' + , 'fr.insee.P12_RP_MIDUR', 'fr.insee.P12_RP_CLIM' + , 'fr.insee.P12_RP_MIBOIS', 'fr.insee.P12_RP_CASE' + , 'fr.insee.P12_RP_TTEGOU', 'fr.insee.P12_RP_ELEC' + , 'fr.insee.P12_ACTOCC15P_ILT45D' + , 'fr.insee.P12_RP_CHOS', 'fr.insee.P12_RP_HABFOR' + , 'fr.insee.P12_RP_EAUCH', 'fr.insee.P12_RP_BDWC' + , 'fr.insee.P12_RP_MIDUR', 'fr.insee.P12_RP_CLIM' + , 'fr.insee.P12_RP_MIBOIS', 'fr.insee.P12_RP_CASE' + , 'fr.insee.P12_RP_TTEGOU', 'fr.insee.P12_RP_ELEC' + , 'fr.insee.P12_ACTOCC15P_ILT45D'): + return 'ST_SetSRID(ST_MakePoint(-52.32908248901367, 4.938408371206558), 4326)' + elif column_id.startswith('fr'): + return 'ST_SetSRID(ST_MakePoint(2.3613739013671875, 48.860875144709475), 4326)' + elif column_id.startswith('ca'): + return 'ST_SetSRID(ST_MakePoint(-79.37965393066406, 43.65594991256823), 4326)' else: return 'ST_SetSRID(ST_MakePoint(-73.9, 40.7), 4326)' From 89d10ff993dbd71fba8a5cc57be3722068d33397 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Fri, 14 Oct 2016 18:39:47 +0000 Subject: [PATCH 2/2] do not skip canada tests --- src/python/test/autotest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/python/test/autotest.py b/src/python/test/autotest.py index a1d1961..1c982af 100644 --- a/src/python/test/autotest.py +++ b/src/python/test/autotest.py @@ -111,7 +111,6 @@ def default_point(column_id): elif column_id.startswith('mx.'): return 'ST_SetSRID(ST_MakePoint(-99.17019367218018, 19.41347699386547), 4326)' elif column_id.startswith('ca.'): - raise SkipTest('Skipping Canada until validation of data complete') return 'ST_SetSRID(ST_MakePoint(-79.39716339111328, 43.65694347778308), 4326)' elif column_id.startswith('th.'): return 'ST_SetSRID(ST_MakePoint(100.49263000488281, 13.725377712079784), 4326)'