diff options
| author | Marc Tamlyn <marc.tamlyn@gmail.com> | 2014-03-15 12:47:32 +0000 |
|---|---|---|
| committer | Marc Tamlyn <marc.tamlyn@gmail.com> | 2014-03-15 12:49:03 +0000 |
| commit | 834d78ffc3a7eb62d55ac269f83ac0e7473662ea (patch) | |
| tree | 71b0512c8ab4712f07ed915c7b20b2f470f837cd | |
| parent | 659b5678fcb89417ce1967bc590fdd693f906e69 (diff) | |
Remove u prefixes, skip test unless spatial db.
Refs #22001, d22b291890c1736a40c0ad97448c7318df2eebb2
| -rw-r--r-- | django/contrib/gis/tests/migrations/migrations/0001_initial.py | 6 | ||||
| -rw-r--r-- | django/contrib/gis/tests/migrations/test_commands.py | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/django/contrib/gis/tests/migrations/migrations/0001_initial.py b/django/contrib/gis/tests/migrations/migrations/0001_initial.py index 165a21700c..f3aab6c754 100644 --- a/django/contrib/gis/tests/migrations/migrations/0001_initial.py +++ b/django/contrib/gis/tests/migrations/migrations/0001_initial.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Neighborhood', fields=[ - (u'id', models.AutoField(verbose_name=u'ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.TextField(unique=True)), ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, null=True)), ], @@ -20,8 +20,8 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Household', fields=[ - (u'id', models.AutoField(verbose_name=u'ID', serialize=False, auto_created=True, primary_key=True)), - ('neighborhood', models.ForeignKey(to='gis.Neighborhood', to_field=u'id', null=True)), + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('neighborhood', models.ForeignKey(to='gis.Neighborhood', to_field='id', null=True)), ('address', models.TextField()), ('zip_code', models.IntegerField(null=True, blank=True)), ('geom', django.contrib.gis.db.models.fields.PointField(srid=4326, null=True, geography=True)), diff --git a/django/contrib/gis/tests/migrations/test_commands.py b/django/contrib/gis/tests/migrations/test_commands.py index 5454042100..1c675e4c86 100644 --- a/django/contrib/gis/tests/migrations/test_commands.py +++ b/django/contrib/gis/tests/migrations/test_commands.py @@ -1,6 +1,8 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals +from unittest import skipUnless + +from django.contrib.gis.tests.utils import HAS_SPATIAL_DB from django.core.management import call_command from django.db import connection from django.test import override_settings, override_system_checks, TransactionTestCase @@ -24,6 +26,7 @@ class MigrateTests(TransactionTestCase): with connection.cursor() as cursor: self.assertNotIn(table, connection.introspection.get_table_list(cursor)) + @skipUnless(HAS_SPATIAL_DB, "Spatial db is required.") @override_system_checks([]) @override_settings(MIGRATION_MODULES={"gis": "django.contrib.gis.tests.migrations.migrations"}) def test_migrate_gis(self): |