From 2e5b82f6277227b69e9a6c5261a6deb14fff15dc Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Tue, 18 Mar 2014 14:51:06 +0100 Subject: Made a test app label unique. --- .../contrib/gis/tests/gis_migrations/__init__.py | 0 .../gis_migrations/migrations/0001_initial.py | 33 ++++++++++++++ .../tests/gis_migrations/migrations/__init__.py | 0 .../gis/tests/gis_migrations/test_commands.py | 50 ++++++++++++++++++++++ django/contrib/gis/tests/migrations/__init__.py | 0 .../tests/migrations/migrations/0001_initial.py | 33 -------------- .../gis/tests/migrations/migrations/__init__.py | 0 .../contrib/gis/tests/migrations/test_commands.py | 50 ---------------------- 8 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 django/contrib/gis/tests/gis_migrations/__init__.py create mode 100644 django/contrib/gis/tests/gis_migrations/migrations/0001_initial.py create mode 100644 django/contrib/gis/tests/gis_migrations/migrations/__init__.py create mode 100644 django/contrib/gis/tests/gis_migrations/test_commands.py delete mode 100644 django/contrib/gis/tests/migrations/__init__.py delete mode 100644 django/contrib/gis/tests/migrations/migrations/0001_initial.py delete mode 100644 django/contrib/gis/tests/migrations/migrations/__init__.py delete mode 100644 django/contrib/gis/tests/migrations/test_commands.py diff --git a/django/contrib/gis/tests/gis_migrations/__init__.py b/django/contrib/gis/tests/gis_migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/gis/tests/gis_migrations/migrations/0001_initial.py b/django/contrib/gis/tests/gis_migrations/migrations/0001_initial.py new file mode 100644 index 0000000000..f3aab6c754 --- /dev/null +++ b/django/contrib/gis/tests/gis_migrations/migrations/0001_initial.py @@ -0,0 +1,33 @@ +from django.db import models, migrations +import django.contrib.gis.db.models.fields + + +# Used for regression test of ticket #22001: https://code.djangoproject.com/ticket/22001 +class Migration(migrations.Migration): + + operations = [ + migrations.CreateModel( + name='Neighborhood', + fields=[ + ('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)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Household', + fields=[ + ('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)), + ], + options={ + }, + bases=(models.Model,), + ) + ] diff --git a/django/contrib/gis/tests/gis_migrations/migrations/__init__.py b/django/contrib/gis/tests/gis_migrations/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/gis/tests/gis_migrations/test_commands.py b/django/contrib/gis/tests/gis_migrations/test_commands.py new file mode 100644 index 0000000000..1c675e4c86 --- /dev/null +++ b/django/contrib/gis/tests/gis_migrations/test_commands.py @@ -0,0 +1,50 @@ +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 + + +class MigrateTests(TransactionTestCase): + """ + Tests running the migrate command in Geodjango. + """ + available_apps = ["django.contrib.gis"] + + def get_table_description(self, table): + with connection.cursor() as cursor: + return connection.introspection.get_table_description(cursor, table) + + def assertTableExists(self, table): + with connection.cursor() as cursor: + self.assertIn(table, connection.introspection.get_table_list(cursor)) + + def assertTableNotExists(self, table): + 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): + """ + Tests basic usage of the migrate command when a model uses Geodjango + fields. Regression test for ticket #22001: + https://code.djangoproject.com/ticket/22001 + """ + # Make sure no tables are created + self.assertTableNotExists("migrations_neighborhood") + self.assertTableNotExists("migrations_household") + # Run the migrations to 0001 only + call_command("migrate", "gis", "0001", verbosity=0) + # Make sure the right tables exist + self.assertTableExists("gis_neighborhood") + self.assertTableExists("gis_household") + # Unmigrate everything + call_command("migrate", "gis", "zero", verbosity=0) + # Make sure it's all gone + self.assertTableNotExists("gis_neighborhood") + self.assertTableNotExists("gis_household") diff --git a/django/contrib/gis/tests/migrations/__init__.py b/django/contrib/gis/tests/migrations/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/django/contrib/gis/tests/migrations/migrations/0001_initial.py b/django/contrib/gis/tests/migrations/migrations/0001_initial.py deleted file mode 100644 index f3aab6c754..0000000000 --- a/django/contrib/gis/tests/migrations/migrations/0001_initial.py +++ /dev/null @@ -1,33 +0,0 @@ -from django.db import models, migrations -import django.contrib.gis.db.models.fields - - -# Used for regression test of ticket #22001: https://code.djangoproject.com/ticket/22001 -class Migration(migrations.Migration): - - operations = [ - migrations.CreateModel( - name='Neighborhood', - fields=[ - ('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)), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='Household', - fields=[ - ('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)), - ], - options={ - }, - bases=(models.Model,), - ) - ] diff --git a/django/contrib/gis/tests/migrations/migrations/__init__.py b/django/contrib/gis/tests/migrations/migrations/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/django/contrib/gis/tests/migrations/test_commands.py b/django/contrib/gis/tests/migrations/test_commands.py deleted file mode 100644 index 1c675e4c86..0000000000 --- a/django/contrib/gis/tests/migrations/test_commands.py +++ /dev/null @@ -1,50 +0,0 @@ -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 - - -class MigrateTests(TransactionTestCase): - """ - Tests running the migrate command in Geodjango. - """ - available_apps = ["django.contrib.gis"] - - def get_table_description(self, table): - with connection.cursor() as cursor: - return connection.introspection.get_table_description(cursor, table) - - def assertTableExists(self, table): - with connection.cursor() as cursor: - self.assertIn(table, connection.introspection.get_table_list(cursor)) - - def assertTableNotExists(self, table): - 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): - """ - Tests basic usage of the migrate command when a model uses Geodjango - fields. Regression test for ticket #22001: - https://code.djangoproject.com/ticket/22001 - """ - # Make sure no tables are created - self.assertTableNotExists("migrations_neighborhood") - self.assertTableNotExists("migrations_household") - # Run the migrations to 0001 only - call_command("migrate", "gis", "0001", verbosity=0) - # Make sure the right tables exist - self.assertTableExists("gis_neighborhood") - self.assertTableExists("gis_household") - # Unmigrate everything - call_command("migrate", "gis", "zero", verbosity=0) - # Make sure it's all gone - self.assertTableNotExists("gis_neighborhood") - self.assertTableNotExists("gis_household") -- cgit v1.3