Rework django_use_model to fix issues noted in #270

Author: timb07

pytest_django/plugin.py

@@ -418,15 +418,15 @@ def _django_use_model(request):
     else:
         models = (model,)
 
-    with contextlib.closing(connection.schema_editor()) as schema:
+    with connection.schema_editor() as schema:
         schema.deferred_sql = []
         for model_class in models:
             if not hasattr(model, '_meta'):
                 raise ValueError('"model" must be a valid model class')
             schema.create_model(model_class)
 
     def drop():
-        with contextlib.closing(connection.schema_editor()) as schema:
+        with connection.schema_editor() as schema:
             for model_class in models:
                 schema.delete_model(model_class)
 

tests/test_database.py

@@ -141,6 +141,8 @@ def test_transactions_enabled(self):
         assert not connection.in_atomic_block
 
 
+@pytest.mark.skipif(not hasattr(connection, 'schema_editor'),
+                    reason="This Django version does not support SchemaEditor")
 @pytest.mark.django_db
 class TestUseModel:
     """Tests for django_use_model marker"""
@@ -163,10 +165,20 @@ def test_unmanaged_destroyed(self):
         self.test_unmanaged_missing()
 
 
-
-@pytest.mark.django_use_model(Unmanaged)
+# TODO: Remove this next test before release
+@pytest.mark.skipif(not hasattr(connection, 'schema_editor'),
+                    reason="This Django version does not support SchemaEditor")
+@pytest.mark.django_db
+@pytest.mark.django_use_model(model=Unmanaged)
 def test_marked_test_not_get_hit():
-    assert True is False
+    """
+    A failing test like this was originally added to demonstrate that adding
+    "@pytest.mark.django_use_model(ModelClass)" caused a test not to be
+    collected. It's left here to demonstrate that it's now being collected
+    when called with model=ModelClass instead; it should be removed before
+    the next release.
+    """
+    assert "This test failing shows that it is being collected and run" is False
 
 
 def test_unittest_interaction(django_testdir):