Fixed #22402 -- Consolidated model_inheritance tests.

The model_inheritance_same_model_name tests couldn't be run without the
model_inheritance tests. Make the problem go away by merging them.

Thanks timo for the report.

2 files changed, 19 insertions, 0 deletions

diff --git a/tests/model_inheritance/same_model_name/__init__.py b/tests/model_inheritance/same_model_name/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/model_inheritance/same_model_name/__init__.py
diff --git a/tests/model_inheritance/same_model_name/models.py b/tests/model_inheritance/same_model_name/models.py
new file mode 100644
index 0000000000..307a505ee6
--- /dev/null
+++ b/tests/model_inheritance/same_model_name/models.py
@@ -0,0 +1,19 @@
+"""
+
+Model inheritance across apps can result in models with the same name,
+requiring an %(app_label)s format string. This app tests this feature by
+redefining the Copy model from model_inheritance/models.py.
+"""
+
+from django.db import models
+
+from model_inheritance.models import NamedURL
+from django.utils.encoding import python_2_unicode_compatible
+
+
+@python_2_unicode_compatible
+class Copy(NamedURL):
+    content = models.TextField()
+
+    def __str__(self):
+        return self.content