Moved tests out of the application package.

charettes · Jun 3, 2015 · 90cdd6f · 90cdd6f
1 parent bf17508
commit 90cdd6f
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 13 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,4 +1,3 @@
 [run]
 source = polymodels
 branch = True
-omit = polymodels/*tests*
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
     install_requires=(
         'django>=1.4',
     ),
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,
     license='MIT License',
     classifiers=[

diff --git a/polymodels/tests/__init__.py → tests/__init__.py b/polymodels/tests/__init__.py → tests/__init__.py
diff --git a/polymodels/tests/base.py → tests/base.py b/polymodels/tests/base.py → tests/base.py
diff --git a/polymodels/tests/forms.py → tests/forms.py b/polymodels/tests/forms.py → tests/forms.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
-from ..forms import PolymorphicModelForm
+from polymodels.forms import PolymorphicModelForm
+
 from .models import Animal, BigSnake, Snake
 
 

diff --git a/polymodels/tests/models.py → tests/models.py b/polymodels/tests/models.py → tests/models.py
@@ -4,8 +4,8 @@
 
 from django.db import models
 
-from ..fields import PolymorphicTypeField
-from ..models import PolymorphicModel
+from polymodels.fields import PolymorphicTypeField
+from polymodels.models import PolymorphicModel
 
 
 class Zoo(models.Model):

diff --git a/polymodels/tests/settings.py → tests/settings.py b/polymodels/tests/settings.py → tests/settings.py
diff --git a/polymodels/tests/test_fields.py → tests/test_fields.py b/polymodels/tests/test_fields.py → tests/test_fields.py
@@ -5,8 +5,9 @@
 from django.db import models
 from django.db.models.query_utils import Q
 
-from ..compat import get_content_type, get_remote_field, skipUnless
-from ..fields import PolymorphicTypeField
+from polymodels.compat import get_content_type, get_remote_field, skipUnless
+from polymodels.fields import PolymorphicTypeField
+
 from .base import TestCase
 from .models import AcknowledgedTrait, HugeSnake, Snake, Trait
 

diff --git a/polymodels/tests/test_forms.py → tests/test_forms.py b/polymodels/tests/test_forms.py → tests/test_forms.py
diff --git a/polymodels/tests/test_managers.py → tests/test_managers.py b/polymodels/tests/test_managers.py → tests/test_managers.py
@@ -4,7 +4,8 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 
-from ..managers import PolymorphicManager
+from polymodels.managers import PolymorphicManager
+
 from .base import TestCase
 from .models import Animal, BigSnake, HugeSnake, Mammal, Monkey, Snake
 

diff --git a/polymodels/tests/test_models.py → tests/test_models.py b/polymodels/tests/test_models.py → tests/test_models.py
@@ -3,7 +3,8 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 
-from ..models import BasePolymorphicModel
+from polymodels.models import BasePolymorphicModel
+
 from .base import TestCase
 from .models import Animal, BigSnake, HugeSnake, Mammal, Snake
 
@@ -16,18 +17,18 @@ def test_improperly_configured(self):
             class NoCtFieldModel(BasePolymorphicModel):
                 pass
         with self.assertRaisesMessage(ImproperlyConfigured,
-                                      '`polymodels.tests.test_models.InexistentCtFieldModel.CONTENT_TYPE_FIELD` '
+                                      '`tests.test_models.InexistentCtFieldModel.CONTENT_TYPE_FIELD` '
                                       'points to an inexistent field "inexistent_field".'):
             class InexistentCtFieldModel(BasePolymorphicModel):
                 CONTENT_TYPE_FIELD = 'inexistent_field'
         with self.assertRaisesMessage(ImproperlyConfigured,
-                                      '`polymodels.tests.test_models.InvalidCtFieldModel.a_char_field` '
+                                      '`tests.test_models.InvalidCtFieldModel.a_char_field` '
                                       'must be a `ForeignKey` to `ContentType`.'):
             class InvalidCtFieldModel(BasePolymorphicModel):
                 CONTENT_TYPE_FIELD = 'a_char_field'
                 a_char_field = models.CharField(max_length=255)
         with self.assertRaisesMessage(ImproperlyConfigured,
-                                      '`polymodels.tests.test_models.InvalidCtFkFieldToModel.a_fk` '
+                                      '`tests.test_models.InvalidCtFkFieldToModel.a_fk` '
                                       'must be a `ForeignKey` to `ContentType`.'):
             class InvalidCtFkFieldToModel(BasePolymorphicModel):
                 CONTENT_TYPE_FIELD = 'a_fk'

diff --git a/polymodels/tests/test_related.py → tests/test_related.py b/polymodels/tests/test_related.py → tests/test_related.py
diff --git a/tox.ini b/tox.ini
@@ -16,7 +16,7 @@ basepython =
     py34: python3.4
 usedevelop = true
 commands =
-    {envpython} -R -Wonce {envbindir}/coverage run {envbindir}/django-admin.py test -v2 --settings=polymodels.tests.settings {posargs}
+    {envpython} -R -Wonce {envbindir}/coverage run {envbindir}/django-admin.py test -v2 --settings=tests.settings {posargs}
     coverage report
 deps =
     coverage