Restructured testing stuff.

stephrdev · Apr 17, 2013 · 134fada · 134fada
1 parent 6afaa47
commit 134fada
Show file tree

Hide file tree

Showing 25 changed files with 31 additions and 5 deletions.
diff --git a/conftest.py b/conftest.py
@@ -0,0 +1,4 @@
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), 'tests'))
diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,6 @@
 [pytest]
-addopts = -v --tb=short --pep8 --flakes --cov=userprofiles/ --cov-report=term-missing --cov-report=html userprofiles/
+addopts = -v --tb=short --pep8 --flakes --cov=userprofiles/ --cov-report=term-missing --cov-report=html userprofiles/ tests/
+norecursedirs = test_project
 pep8ignore =
     *.py E501 E128
 

diff --git a/test_project/__init__.py → tests/test_accountverification/__init__.py b/test_project/__init__.py → tests/test_accountverification/__init__.py
diff --git a/.../accountverification/tests/test_models.py → ...s/test_accountverification/test_models.py b/.../accountverification/tests/test_models.py → ...s/test_accountverification/test_models.py
diff --git a/...b/accountverification/tests/test_views.py → tests/test_accountverification/test_views.py b/...b/accountverification/tests/test_views.py → tests/test_accountverification/test_views.py
diff --git a/userprofiles/tests/test_auth_backends.py → tests/test_auth_backends.py b/userprofiles/tests/test_auth_backends.py → tests/test_auth_backends.py
diff --git a/test_project/test_accounts/__init__.py → tests/test_emailverification/__init__.py b/test_project/test_accounts/__init__.py → tests/test_emailverification/__init__.py
diff --git a/...rib/emailverification/tests/test_views.py → tests/test_emailverification/test_views.py b/...rib/emailverification/tests/test_views.py → tests/test_emailverification/test_views.py
diff --git a/userprofiles/tests/test_forms.py → tests/test_forms.py b/userprofiles/tests/test_forms.py → tests/test_forms.py
diff --git a/...rib/accountverification/tests/__init__.py → tests/test_profiles/__init__.py b/...rib/accountverification/tests/__init__.py → tests/test_profiles/__init__.py
diff --git a/...iles/contrib/profiles/tests/test_views.py → tests/test_profiles/test_views.py b/...iles/contrib/profiles/tests/test_views.py → tests/test_profiles/test_views.py
diff --git a/...ntrib/emailverification/tests/__init__.py → tests/test_project/__init__.py b/...ntrib/emailverification/tests/__init__.py → tests/test_project/__init__.py
diff --git a/test_project/manage.py → tests/test_project/manage.py b/test_project/manage.py → tests/test_project/manage.py
diff --git a/test_project/requirements.txt → tests/test_project/requirements.txt b/test_project/requirements.txt → tests/test_project/requirements.txt
diff --git a/test_project/settings.py → tests/test_project/settings.py b/test_project/settings.py → tests/test_project/settings.py
@@ -1,9 +1,5 @@
 import os
 
-TEST_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
-    '..', 'userprofiles', 'tests'))
-
-TEST_RUNNER = 'discover_runner.DiscoverRunner'
 
 DATABASES = {
     'default': {

diff --git a/test_project/templates/base.html → tests/test_project/templates/base.html b/test_project/templates/base.html → tests/test_project/templates/base.html
diff --git a/...ofiles/contrib/profiles/tests/__init__.py → tests/test_project/test_accounts/__init__.py b/...ofiles/contrib/profiles/tests/__init__.py → tests/test_project/test_accounts/__init__.py
diff --git a/test_project/test_accounts/forms.py → tests/test_project/test_accounts/forms.py b/test_project/test_accounts/forms.py → tests/test_project/test_accounts/forms.py
diff --git a/test_project/test_accounts/models.py → tests/test_project/test_accounts/models.py b/test_project/test_accounts/models.py → tests/test_project/test_accounts/models.py
diff --git a/test_project/urls.py → tests/test_project/urls.py b/test_project/urls.py → tests/test_project/urls.py
diff --git a/userprofiles/tests/test_settings.py → tests/test_settings.py b/userprofiles/tests/test_settings.py → tests/test_settings.py
diff --git a/userprofiles/tests/test_utils.py → tests/test_utils.py b/userprofiles/tests/test_utils.py → tests/test_utils.py
diff --git a/userprofiles/tests/test_views.py → tests/test_views.py b/userprofiles/tests/test_views.py → tests/test_views.py
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,25 @@
+[tox]
+envlist =
+    django1.5-py27, django1.6-py27
+
+indexserver =
+    default = https://simple.crate.io
+downloadcache = ~/.pip/cache/
+
+[testenv]
+deps =
+    -r{toxinidir}/tests/test_project/requirements.txt
+commands =
+    py.test
+
+[testenv:django1.5-py27]
+basepython = python2.7
+deps =
+    Django==1.5.1
+    {[testenv]deps}
+
+[testenv:django1.6-py27]
+basepython = python2.7
+deps =
+    https://github.com/django/django/zipball/master
+    {[testenv]deps}
diff --git a/userprofiles/tests/__init__.py b/userprofiles/tests/__init__.py