Moved tests out of the main package.

Also removed some compatiblity shims for Python 2.6.
charettes · Dec 18, 2015 · 37d12f0 · 37d12f0
1 parent 4525318
commit 37d12f0
Show file tree

Hide file tree

Showing 26 changed files with 96 additions and 94 deletions.
diff --git a/tenancy/tests/hosts.py b/tenancy/tests/hosts.py
diff --git a/tenancy/utils.py b/tenancy/utils.py
@@ -120,6 +120,8 @@ def clear_opts_related_cache(model_class):
     Clear the specified model and its children opts related cache.
     """
     opts = model_class._meta
+    if not opts.apps.ready:
+        return
     children = [
         related_object.model
         for related_object in opts.get_all_related_objects()

diff --git a/tenancy/tests/__init__.py → tests/__init__.py b/tenancy/tests/__init__.py → tests/__init__.py
diff --git a/tenancy/tests/client.py → tests/client.py b/tenancy/tests/client.py → tests/client.py
diff --git a/tenancy/tests/forms.py → tests/forms.py b/tenancy/tests/forms.py → tests/forms.py
diff --git a/tests/hosts.py b/tests/hosts.py
@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+
+from django_hosts import host
+from tenancy.settings import HOST_NAME
+
+host_patterns = [
+    host(r'(?P<name>[\w-]+)', 'tests.tenant_urls', name=HOST_NAME),
+    host(r'', 'tests.urls', name='default'),
+]
diff --git a/tenancy/tests/managers.py → tests/managers.py b/tenancy/tests/managers.py → tests/managers.py
diff --git a/tenancy/tests/models.py → tests/models.py b/tenancy/tests/models.py → tests/models.py
@@ -1,14 +1,13 @@
 from __future__ import unicode_literals
 
-import sys
-
 from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 
-from ..models import Tenant, TenantModel
-from ..utils import model_sender_signals
+from tenancy.models import Tenant, TenantModel
+from tenancy.utils import model_sender_signals
+
 from .managers import ManagerOtherSubclass, ManagerSubclass
 
 try:
@@ -23,22 +22,22 @@
 
 class NonTenantModel(models.Model):
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
 
 
 class AbstractNonTenant(models.Model):
     hidden_non_tenant = models.ForeignKey(NonTenantModel, null=True)
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
         abstract = True
 
 
 class AbstractTenantModel(TenantModel):
     date = models.DateField(null=True)
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
         abstract = True
 
 
@@ -59,7 +58,7 @@ class SpecificModel(AbstractTenantModel, AbstractNonTenant, TenantModelMixin):
     custom_objects = ManagerOtherSubclass()
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
         db_table = 'custom_db_table'
 
     class TenantMeta:
@@ -89,7 +88,7 @@ class PostInitFieldsModel(TenantModel):
         image = models.ImageField(upload_to='void')
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
 
     class TenantMeta:
         related_name = 'postinits'
@@ -102,7 +101,7 @@ class GenericRelationModel(TenantModel):
     postinits = GenericRelation(PostInitFieldsModel)
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
 
     class TenantMeta:
         related_name = 'generic_relations'
@@ -116,7 +115,7 @@ class SpecificModelProxy(SpecificModel):
     proxied_objects = ManagerSubclass()
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
         proxy = True
 
     class TenantMeta:
@@ -128,7 +127,7 @@ def test_mro(self):
 
 class SpecificModelProxySubclass(SpecificModelProxy):
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
         proxy = True
 
     def test_mro(self):
@@ -139,7 +138,7 @@ class SpecificModelSubclass(SpecificModel):
     objects = ManagerOtherSubclass()
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
 
     class TenantMeta:
         related_name = 'specific_models_subclasses'
@@ -150,7 +149,7 @@ def test_mro(self):
 
 class SpecificModelSubclassProxy(SpecificModelSubclass):
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
         proxy = True
 
     def test_mro(self):
@@ -159,7 +158,7 @@ def test_mro(self):
 
 class RelatedSpecificModel(TenantModel):
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
 
     class TenantMeta:
         related_name = 'related_specific_models'
@@ -172,7 +171,7 @@ class AbstractSpecificModelSubclass(TenantModel):
     fk = models.ForeignKey(SpecificModel, related_name='fks', null=True)
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
         abstract = True
 
 
@@ -188,7 +187,7 @@ class RelatedTenantModel(AbstractSpecificModelSubclass):
     )
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
 
     class TenantMeta:
         related_name = 'related_tenant_models'
@@ -204,7 +203,7 @@ class M2MSpecific(TenantModel):
     )
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
         index_together = (
             ('related', 'specific'),
         )
@@ -218,7 +217,7 @@ def test_mro(self):
 
 class SignalTenantModel(TenantModel):
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
 
     class TenantMeta:
         related_name = 'signal_models'
@@ -274,7 +273,7 @@ class TenantUser(TenantModel, AbstractBaseUser):
     USERNAME_FIELD = 'email'
 
     class Meta:
-        app_label = 'tenancy'
+        app_label = 'tests'
 
     class TenantMeta:
         related_name = 'users'
@@ -284,42 +283,41 @@ def test_mro(self):
 
 
 try:
-    from ..mutant.models import ModelDefinition, MutableTenantModel
+    from tenancy.mutant.models import ModelDefinition, MutableTenantModel
 except ImportError:
     pass
 else:
-    if sys.version_info >= (2, 7):
-        class MutableModel(MutableTenantModel):
-            field = models.BooleanField()
-            model_def = models.ForeignKey(ModelDefinition, null=True)
+    class MutableModel(MutableTenantModel):
+        field = models.BooleanField()
+        model_def = models.ForeignKey(ModelDefinition, null=True)
 
-            class Meta:
-                app_label = 'tenancy'
-                ordering = ('-id',)
+        class Meta:
+            app_label = 'tests'
+            ordering = ('-id',)
 
-            class TenantMeta:
-                related_name = 'mutable_models'
+        class TenantMeta:
+            related_name = 'mutable_models'
 
-            def test_mro(self):
-                return 'MutableModel'
+        def test_mro(self):
+            return 'MutableModel'
 
-        class MutableModelSubclass(MutableModel):
-            non_mutable_fk = models.ForeignKey(SpecificModel, related_name='mutables')
+    class MutableModelSubclass(MutableModel):
+        non_mutable_fk = models.ForeignKey(SpecificModel, related_name='mutables')
 
-            class Meta:
-                app_label = 'tenancy'
+        class Meta:
+            app_label = 'tests'
 
-            def test_mro(self):
-                return 'MutableModelSubclass'
+        def test_mro(self):
+            return 'MutableModelSubclass'
 
-        class NonMutableModel(TenantModel):
-            mutable_fk = models.ForeignKey(MutableModel, related_name='non_mutables')
+    class NonMutableModel(TenantModel):
+        mutable_fk = models.ForeignKey(MutableModel, related_name='non_mutables')
 
-            class Meta:
-                app_label = 'tenancy'
+        class Meta:
+            app_label = 'tests'
 
-            def test_mro(self):
-                return 'NonMutableModel'
+        def test_mro(self):
+            return 'NonMutableModel'
 
 
 try:

diff --git a/test_settings/__init__.py → tests/settings/__init__.py b/test_settings/__init__.py → tests/settings/__init__.py
@@ -4,9 +4,10 @@
     'django.contrib.contenttypes',
     'django.contrib.auth',
     'tenancy',
+    'tests',
 ]
 
-ROOT_URLCONF = 'tenancy.tests.urls'
+ROOT_URLCONF = 'tests.urls'
 
 SILENCED_SYSTEM_CHECKS = ['1_7.W001']
 

diff --git a/test_settings/postgresql_psycopg2.py → tests/settings/postgresql_psycopg2.py b/test_settings/postgresql_psycopg2.py → tests/settings/postgresql_psycopg2.py
@@ -1,6 +1,5 @@
 from . import *  # NOQA
 
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',

diff --git a/test_settings/sqlite3.py → tests/settings/sqlite3.py b/test_settings/sqlite3.py → tests/settings/sqlite3.py
@@ -1,6 +1,5 @@
 from . import *  # NOQA
 
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',

diff --git a/tenancy/tests/tenant_urls.py → tests/tenant_urls.py b/tenancy/tests/tenant_urls.py → tests/tenant_urls.py
@@ -3,7 +3,7 @@
 from django.conf.urls import url
 from django.http import HttpResponse
 
-from ..models import Tenant
+from tenancy.models import Tenant
 
 urlpatterns = [
     url(r'^$',

diff --git a/tenancy/tests/test_auth.py → tests/test_auth.py b/tenancy/tests/test_auth.py → tests/test_auth.py
@@ -3,7 +3,8 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.test.utils import override_settings
 
-from ..auth.backends import CustomTenantUserBackend
+from tenancy.auth.backends import CustomTenantUserBackend
+
 from .utils import TenancyTestCase, setup_custom_tenant_user
 
 
@@ -18,7 +19,7 @@ def test_custom_user_not_tenant(self):
             CustomTenantUserBackend
         )
 
-    @override_settings(AUTH_USER_MODEL='tenancy.TenantUser')
+    @override_settings(AUTH_USER_MODEL='tests.TenantUser')
     def test_missing_connection_tenant(self):
         self.assertRaisesMessage(
             ImproperlyConfigured,

diff --git a/tenancy/tests/test_commands.py → tests/test_commands.py b/tenancy/tests/test_commands.py → tests/test_commands.py
@@ -11,9 +11,10 @@
 from django.test.testcases import TransactionTestCase
 from django.utils.six import StringIO
 
-from ..models import Tenant, TenantModelBase
-from ..signals import post_schema_deletion, pre_schema_creation
-from ..utils import allow_migrate
+from tenancy.models import Tenant, TenantModelBase
+from tenancy.signals import post_schema_deletion, pre_schema_creation
+from tenancy.utils import allow_migrate
+
 from .utils import (
     TenancyTestCase, mock_inputs, setup_custom_tenant_user, skipIfCustomTenant,
 )

diff --git a/tenancy/tests/test_forms.py → tests/test_forms.py b/tenancy/tests/test_forms.py → tests/test_forms.py
@@ -3,11 +3,12 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.forms.models import modelform_factory, modelformset_factory
 
-from ..forms import (
+from tenancy.forms import (
     tenant_inlineformset_factory, tenant_modelform_factory,
     tenant_modelformset_factory,
 )
-from ..models import Tenant
+from tenancy.models import Tenant
+
 from .forms import (
     NonTenantInlineFormSet, RelatedInlineFormSet, RelatedTenantModelForm,
     SpecificModelForm, SpecificModelFormSet,

diff --git a/tenancy/tests/test_hosts.py → tests/test_hosts.py b/tenancy/tests/test_hosts.py → tests/test_hosts.py
@@ -6,8 +6,9 @@
 from django.test.utils import override_settings
 from django.utils.encoding import force_bytes
 
-from ..middleware import TenantHostMiddleware
-from ..models import Tenant
+from tenancy.middleware import TenantHostMiddleware
+from tenancy.models import Tenant
+
 from .utils import TenancyTestCase
 
 try:
@@ -19,7 +20,7 @@
 def django_hosts_installed_setup(func):
     func = override_settings(
         DEFAULT_HOST='default',
-        ROOT_HOSTCONF='tenancy.tests.hosts',
+        ROOT_HOSTCONF='tests.hosts',
         MIDDLEWARE_CLASSES=(
             'django_hosts.middleware.HostsMiddleware',
             'tenancy.middleware.TenantHostMiddleware'
@@ -31,7 +32,7 @@ def django_hosts_installed_setup(func):
     )(func)
 
 
-@override_settings(ROOT_URLCONF='tenancy.tests.urls')
+@override_settings(ROOT_URLCONF='tests.urls')
 class TenantHostMiddlewareTest(TenancyTestCase):
     @classmethod
     def tenant_client(cls, tenant):

diff --git a/tenancy/tests/test_managers.py → tests/test_managers.py b/tenancy/tests/test_managers.py → tests/test_managers.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
-from ..models import Tenant
+from tenancy.models import Tenant
+
 from .models import (
     SpecificModel, SpecificModelProxy, SpecificModelSubclass,
     SpecificModelSubclassProxy,

diff --git a/tenancy/tests/test_middleware.py → tests/test_middleware.py b/tenancy/tests/test_middleware.py → tests/test_middleware.py
@@ -10,7 +10,7 @@
 
 
 @override_settings(
-    ROOT_URLCONF='tenancy.tests.urls',
+    ROOT_URLCONF='tests.urls',
     MIDDLEWARE_CLASSES=(
         'tenancy.middleware.GlobalTenantMiddleware',
     ),