Improved GIS migration test cleanup; refs #23504.

django/contrib/gis/tests/gis_migrations/test_operations.py

@@ -64,6 +64,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
@@ -72,7 +73,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):
         """
@@ -84,6 +84,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
@@ -92,4 +93,3 @@ class OperationTests(TransactionTestCase):
                 GeometryColumns.objects.filter(**{GeometryColumns.table_name_col(): "gis_neighborhood"}).count(),
                 0
             )
-        self.current_state = new_state