mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-03 15:06:09 +00:00
Code Issues 30 Releases Wiki Activity

Fixed inspectapp tests to work with improved PG driver in GDAL 1.9+.

Browse Source
This commit is contained in:
Justin Bronn 2012-10-07 20:08:31 -07:00
parent 08eb54ae71
commit 75301d99d3
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
django/contrib/gis/tests/inspectapp/tests.py
View File

@ -4,7 +4,7 @@ import os
from django.db import connections from django.db import connections
from django.test import TestCase from django.test import TestCase
from django.contrib.gis.gdal import Driver from django.contrib.gis.gdal import Driver, GDAL_VERSION
from django.contrib.gis.geometry.test_data import TEST_DATA from django.contrib.gis.geometry.test_data import TEST_DATA
from django.contrib.gis.utils.ogrinspect import ogrinspect from django.contrib.gis.utils.ogrinspect import ogrinspect
@ -74,15 +74,33 @@ class OGRInspectTest(TestCase):
'', '',
'class Measurement(models.Model):', 'class Measurement(models.Model):',
' f_decimal = models.DecimalField(max_digits=0, decimal_places=0)', ' f_decimal = models.DecimalField(max_digits=0, decimal_places=0)',
]
if GDAL_VERSION < (1, 9, 0):
# Prior to GDAL 1.9, the order of the model fields was not
# the same as the columns in the database.
expected.extend([
' f_int = models.IntegerField()', ' f_int = models.IntegerField()',
' f_datetime = models.DateTimeField()', ' f_datetime = models.DateTimeField()',
' f_time = models.TimeField()', ' f_time = models.TimeField()',
' f_float = models.FloatField()', ' f_float = models.FloatField()',
' f_char = models.CharField(max_length=10)', ' f_char = models.CharField(max_length=10)',
' f_date = models.DateField()', ' f_date = models.DateField()',
])
else:
expected.extend([
' f_float = models.FloatField()',
' f_int = models.IntegerField()',
' f_char = models.CharField(max_length=10)',
' f_date = models.DateField()',
' f_datetime = models.DateTimeField()',
' f_time = models.TimeField()',
])
expected.extend([
' geom = models.PolygonField()', ' geom = models.PolygonField()',
' objects = models.GeoManager()', ' objects = models.GeoManager()',
] ])
self.assertEqual(model_def, '\n'.join(expected)) self.assertEqual(model_def, '\n'.join(expected))