Fix random generation of ContentType values when there is no database access

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 ### Changed
+- Fixed random generation of ContentType values when there is no database access [#290](https://github.com/model-bakers/model_bakery/pull/290)
 
 ### Removed
 

model_bakery/random_gen.py

@@ -206,7 +206,11 @@ def gen_content_type():
 
     try:
         return ContentType.objects.get_for_model(choice(apps.get_models()))
-    except AssertionError:
+    except (AssertionError, RuntimeError):
+        # AssertionError is raised by Django's test framework when db access is not available:
+        # https://github.com/django/django/blob/stable/4.0.x/django/test/testcases.py#L150
+        # RuntimeError is raised by pytest-django when db access is not available:
+        # https://github.com/pytest-dev/pytest-django/blob/v4.5.2/pytest_django/plugin.py#L709
         warnings.warn("Database access disabled, returning ContentType raw instance")
         return ContentType()
 

tests/test_baker.py

@@ -5,6 +5,7 @@
 
 import pytest
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.db.models import Manager
 from django.db.models.signals import m2m_changed
 from django.test import TestCase, override_settings
@@ -592,13 +593,18 @@ class TestHandlingContentTypeField:
     def test_create_model_with_contenttype_field(self):
         dummy = baker.make(models.DummyGenericForeignKeyModel)
         assert isinstance(dummy, models.DummyGenericForeignKeyModel)
+        assert isinstance(dummy.content_type, ContentType)
 
 
-@pytest.mark.django_db
 class TestHandlingContentTypeFieldNoQueries:
     def test_create_model_with_contenttype_field(self):
-        dummy = baker.prepare(models.DummyGenericForeignKeyModel)
+        with pytest.warns(
+            UserWarning,
+            match="Database access disabled, returning ContentType raw instance",
+        ):
+            dummy = baker.prepare(models.DummyGenericForeignKeyModel)
         assert isinstance(dummy, models.DummyGenericForeignKeyModel)
+        assert isinstance(dummy.content_type, ContentType)
 
 
 @pytest.mark.django_db