From 07fe0bf3f4a49a734f83f5ea30130449dacf9660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Goc=C5=82awski?= Date: Fri, 13 Dec 2013 15:36:51 +0100 Subject: [PATCH] Allowed running GIS form tests that don't require spatial database --- django/contrib/gis/tests/test_geoforms.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/django/contrib/gis/tests/test_geoforms.py b/django/contrib/gis/tests/test_geoforms.py index 2eb91ec527..a5a33768bc 100644 --- a/django/contrib/gis/tests/test_geoforms.py +++ b/django/contrib/gis/tests/test_geoforms.py @@ -1,16 +1,14 @@ from unittest import skipUnless from django.forms import ValidationError +from django.contrib.gis import forms from django.contrib.gis.gdal import HAS_GDAL +from django.contrib.gis.geos import GEOSGeometry from django.contrib.gis.tests.utils import HAS_SPATIALREFSYS from django.test import SimpleTestCase from django.utils import six from django.utils.html import escape -if HAS_SPATIALREFSYS: - from django.contrib.gis import forms - from django.contrib.gis.geos import GEOSGeometry - @skipUnless(HAS_GDAL and HAS_SPATIALREFSYS, "GeometryFieldTest needs gdal support and a spatial database") class GeometryFieldTest(SimpleTestCase): @@ -258,14 +256,14 @@ class SpecializedFieldTest(SimpleTestCase): self.assertFalse(GeometryForm(data={'g': invalid.wkt}).is_valid()) -@skipUnless(HAS_GDAL and HAS_SPATIALREFSYS, - "OSMWidgetTest needs gdal support and a spatial database") class OSMWidgetTest(SimpleTestCase): def setUp(self): self.geometries = { 'point': GEOSGeometry("SRID=4326;POINT(9.052734375 42.451171875)"), } + @skipUnless(HAS_GDAL and HAS_SPATIALREFSYS, + "test_osm_widget needs gdal support and a spatial database") def test_osm_widget(self): class PointForm(forms.Form): p = forms.PointField(widget=forms.OSMWidget)