diff --git a/tests/testapp/__init__.py b/tests/modeltests/basic/__init__.py similarity index 100% rename from tests/testapp/__init__.py rename to tests/modeltests/basic/__init__.py diff --git a/tests/testapp/models/basic.py b/tests/modeltests/basic/models.py similarity index 100% rename from tests/testapp/models/basic.py rename to tests/modeltests/basic/models.py diff --git a/tests/modeltests/choices/__init__.py b/tests/modeltests/choices/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/choices.py b/tests/modeltests/choices/models.py similarity index 100% rename from tests/testapp/models/choices.py rename to tests/modeltests/choices/models.py diff --git a/tests/modeltests/custom_columns/__init__.py b/tests/modeltests/custom_columns/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/custom_columns.py b/tests/modeltests/custom_columns/models.py similarity index 100% rename from tests/testapp/models/custom_columns.py rename to tests/modeltests/custom_columns/models.py diff --git a/tests/modeltests/custom_methods/__init__.py b/tests/modeltests/custom_methods/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/custom_methods.py b/tests/modeltests/custom_methods/models.py similarity index 100% rename from tests/testapp/models/custom_methods.py rename to tests/modeltests/custom_methods/models.py diff --git a/tests/modeltests/custom_pk/__init__.py b/tests/modeltests/custom_pk/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/custom_pk.py b/tests/modeltests/custom_pk/models.py similarity index 100% rename from tests/testapp/models/custom_pk.py rename to tests/modeltests/custom_pk/models.py diff --git a/tests/modeltests/get_latest/__init__.py b/tests/modeltests/get_latest/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/get_latest.py b/tests/modeltests/get_latest/models.py similarity index 100% rename from tests/testapp/models/get_latest.py rename to tests/modeltests/get_latest/models.py diff --git a/tests/modeltests/lookup/__init__.py b/tests/modeltests/lookup/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/lookup.py b/tests/modeltests/lookup/models.py similarity index 100% rename from tests/testapp/models/lookup.py rename to tests/modeltests/lookup/models.py diff --git a/tests/modeltests/m2m_intermediary/__init__.py b/tests/modeltests/m2m_intermediary/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/m2m_intermediary.py b/tests/modeltests/m2m_intermediary/models.py similarity index 100% rename from tests/testapp/models/m2m_intermediary.py rename to tests/modeltests/m2m_intermediary/models.py diff --git a/tests/modeltests/m2m_multiple/__init__.py b/tests/modeltests/m2m_multiple/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/m2m_multiple.py b/tests/modeltests/m2m_multiple/models.py similarity index 100% rename from tests/testapp/models/m2m_multiple.py rename to tests/modeltests/m2m_multiple/models.py diff --git a/tests/modeltests/m2o_recursive/__init__.py b/tests/modeltests/m2o_recursive/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/m2o_recursive.py b/tests/modeltests/m2o_recursive/models.py similarity index 100% rename from tests/testapp/models/m2o_recursive.py rename to tests/modeltests/m2o_recursive/models.py diff --git a/tests/modeltests/m2o_recursive2/__init__.py b/tests/modeltests/m2o_recursive2/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/m2o_recursive2.py b/tests/modeltests/m2o_recursive2/models.py similarity index 100% rename from tests/testapp/models/m2o_recursive2.py rename to tests/modeltests/m2o_recursive2/models.py diff --git a/tests/modeltests/many_to_many/__init__.py b/tests/modeltests/many_to_many/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/many_to_many.py b/tests/modeltests/many_to_many/models.py similarity index 100% rename from tests/testapp/models/many_to_many.py rename to tests/modeltests/many_to_many/models.py diff --git a/tests/modeltests/many_to_one/__init__.py b/tests/modeltests/many_to_one/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/many_to_one.py b/tests/modeltests/many_to_one/models.py similarity index 100% rename from tests/testapp/models/many_to_one.py rename to tests/modeltests/many_to_one/models.py diff --git a/tests/modeltests/many_to_one_null/__init__.py b/tests/modeltests/many_to_one_null/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/many_to_one_null.py b/tests/modeltests/many_to_one_null/models.py similarity index 100% rename from tests/testapp/models/many_to_one_null.py rename to tests/modeltests/many_to_one_null/models.py diff --git a/tests/modeltests/one_to_one/__init__.py b/tests/modeltests/one_to_one/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/one_to_one.py b/tests/modeltests/one_to_one/models.py similarity index 100% rename from tests/testapp/models/one_to_one.py rename to tests/modeltests/one_to_one/models.py diff --git a/tests/modeltests/or_lookups/__init__.py b/tests/modeltests/or_lookups/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/or_lookups.py b/tests/modeltests/or_lookups/models.py similarity index 100% rename from tests/testapp/models/or_lookups.py rename to tests/modeltests/or_lookups/models.py diff --git a/tests/modeltests/ordering/__init__.py b/tests/modeltests/ordering/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/ordering.py b/tests/modeltests/ordering/models.py similarity index 100% rename from tests/testapp/models/ordering.py rename to tests/modeltests/ordering/models.py diff --git a/tests/modeltests/repr/__init__.py b/tests/modeltests/repr/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/repr.py b/tests/modeltests/repr/models.py similarity index 100% rename from tests/testapp/models/repr.py rename to tests/modeltests/repr/models.py diff --git a/tests/modeltests/reserved_names/__init__.py b/tests/modeltests/reserved_names/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/reserved_names.py b/tests/modeltests/reserved_names/models.py similarity index 100% rename from tests/testapp/models/reserved_names.py rename to tests/modeltests/reserved_names/models.py diff --git a/tests/modeltests/save_delete_hooks/__init__.py b/tests/modeltests/save_delete_hooks/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/save_delete_hooks.py b/tests/modeltests/save_delete_hooks/models.py similarity index 100% rename from tests/testapp/models/save_delete_hooks.py rename to tests/modeltests/save_delete_hooks/models.py diff --git a/tests/modeltests/subclassing/__init__.py b/tests/modeltests/subclassing/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/testapp/models/subclassing.py b/tests/modeltests/subclassing/models.py similarity index 100% rename from tests/testapp/models/subclassing.py rename to tests/modeltests/subclassing/models.py diff --git a/tests/testapp/models/__init__.py b/tests/testapp/models/__init__.py deleted file mode 100644 index 0010eeef24..0000000000 --- a/tests/testapp/models/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -__all__ = ['basic', 'repr', 'custom_methods', 'many_to_one', 'many_to_many', - 'ordering', 'lookup', 'get_latest', 'm2m_intermediary', 'one_to_one', - 'm2o_recursive', 'm2o_recursive2', 'save_delete_hooks', 'custom_pk', - 'subclassing', 'many_to_one_null', 'custom_columns', 'reserved_names', - 'or_lookups', 'm2m_multiple', 'choices']