From c61d2c0387aeeaf5600b85c08b0d01b10655155c Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 17 Sep 2014 19:45:42 -0400 Subject: [PATCH] [1.7.x] Improved GIS migration test cleanup; refs #23504. Backport of 8facb02faf from master --- django/contrib/gis/tests/gis_migrations/test_operations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/gis/tests/gis_migrations/test_operations.py b/django/contrib/gis/tests/gis_migrations/test_operations.py index c6ef682e3c..d10542e788 100644 --- a/django/contrib/gis/tests/gis_migrations/test_operations.py +++ b/django/contrib/gis/tests/gis_migrations/test_operations.py @@ -67,6 +67,7 @@ class OperationTests(TransactionTestCase): operation.state_forwards("gis", new_state) with connection.schema_editor() as editor: operation.database_forwards("gis", editor, project_state, new_state) + self.current_state = new_state self.assertColumnExists("gis_neighborhood", "path") # Test GeometryColumns when available @@ -75,7 +76,6 @@ class OperationTests(TransactionTestCase): GeometryColumns.objects.filter(**{GeometryColumns.table_name_col(): "gis_neighborhood"}).count(), 2 ) - self.current_state = new_state def test_remove_gis_field(self): """ @@ -87,6 +87,7 @@ class OperationTests(TransactionTestCase): operation.state_forwards("gis", new_state) with connection.schema_editor() as editor: operation.database_forwards("gis", editor, project_state, new_state) + self.current_state = new_state self.assertColumnNotExists("gis_neighborhood", "geom") # Test GeometryColumns when available @@ -95,4 +96,3 @@ class OperationTests(TransactionTestCase): GeometryColumns.objects.filter(**{GeometryColumns.table_name_col(): "gis_neighborhood"}).count(), 0 ) - self.current_state = new_state