Merge pull request nitely#30 from benjaminabel/tests-reorganisation

Move tests to root directory
Macbull · Nov 20, 2014 · 4fc044c · 4fc044c
2 parents 9fd6930 + 7a44c36
commit 4fc044c
Show file tree

Hide file tree

Showing 29 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,6 @@ install:
 script:
   - pep8 --max-line-length=120 --exclude='migrations,tests' .
   - flake8  --select=F401 ./spirit
-  - coverage run --source=. run_tests.py test
+  - coverage run --source=. runtests.py test
 after_success:
   - coveralls
diff --git a/example/settings_test_runner.py b/example/settings_test_runner.py
@@ -6,5 +6,5 @@
 from .local_settings_sample_dev import *
 
 INSTALLED_APPS += (
-    'spirit.tests',
+    'tests',
 )
diff --git a/run_tests.py → runtests.py b/run_tests.py → runtests.py
@@ -19,7 +19,7 @@ def log_warnings():
 
 def run_tests():
     test_runner = DiscoverRunner()
-    failures = test_runner.run_tests(["spirit", ])
+    failures = test_runner.run_tests(["tests", ])
     sys.exit(failures)
 
 

diff --git a/spirit/tests/__init__.py → tests/__init__.py b/spirit/tests/__init__.py → tests/__init__.py
diff --git a/spirit/tests/migrations/0001_initial.py → tests/migrations/0001_initial.py b/spirit/tests/migrations/0001_initial.py → tests/migrations/0001_initial.py
diff --git a/spirit/tests/migrations/__init__.py → tests/migrations/__init__.py b/spirit/tests/migrations/__init__.py → tests/migrations/__init__.py
diff --git a/spirit/tests/models/__init__.py → tests/models/__init__.py b/spirit/tests/models/__init__.py → tests/models/__init__.py
diff --git a/spirit/tests/models/auto_slug.py → tests/models/auto_slug.py b/spirit/tests/models/auto_slug.py → tests/models/auto_slug.py
diff --git a/spirit/tests/tests_admin.py → tests/tests_admin.py b/spirit/tests/tests_admin.py → tests/tests_admin.py
diff --git a/spirit/tests/tests_category.py → tests/tests_category.py b/spirit/tests/tests_category.py → tests/tests_category.py
diff --git a/spirit/tests/tests_comment.py → tests/tests_comment.py b/spirit/tests/tests_comment.py → tests/tests_comment.py
diff --git a/spirit/tests/tests_comment_bookmark.py → tests/tests_comment_bookmark.py b/spirit/tests/tests_comment_bookmark.py → tests/tests_comment_bookmark.py
diff --git a/spirit/tests/tests_comment_flag.py → tests/tests_comment_flag.py b/spirit/tests/tests_comment_flag.py → tests/tests_comment_flag.py
diff --git a/spirit/tests/tests_comment_history.py → tests/tests_comment_history.py b/spirit/tests/tests_comment_history.py → tests/tests_comment_history.py
diff --git a/spirit/tests/tests_comment_like.py → tests/tests_comment_like.py b/spirit/tests/tests_comment_like.py → tests/tests_comment_like.py
diff --git a/spirit/tests/tests_gravatar.py → tests/tests_gravatar.py b/spirit/tests/tests_gravatar.py → tests/tests_gravatar.py
diff --git a/spirit/tests/tests_search.py → tests/tests_search.py b/spirit/tests/tests_search.py → tests/tests_search.py
diff --git a/spirit/tests/tests_topic.py → tests/tests_topic.py b/spirit/tests/tests_topic.py → tests/tests_topic.py
diff --git a/spirit/tests/tests_topic_favorite.py → tests/tests_topic_favorite.py b/spirit/tests/tests_topic_favorite.py → tests/tests_topic_favorite.py
diff --git a/spirit/tests/tests_topic_notification.py → tests/tests_topic_notification.py b/spirit/tests/tests_topic_notification.py → tests/tests_topic_notification.py
diff --git a/spirit/tests/tests_topic_poll.py → tests/tests_topic_poll.py b/spirit/tests/tests_topic_poll.py → tests/tests_topic_poll.py
diff --git a/spirit/tests/tests_topic_private.py → tests/tests_topic_private.py b/spirit/tests/tests_topic_private.py → tests/tests_topic_private.py
diff --git a/spirit/tests/tests_topic_unread.py → tests/tests_topic_unread.py b/spirit/tests/tests_topic_unread.py → tests/tests_topic_unread.py
diff --git a/spirit/tests/tests_user.py → tests/tests_user.py b/spirit/tests/tests_user.py → tests/tests_user.py
diff --git a/spirit/tests/tests_utils.py → tests/tests_utils.py b/spirit/tests/tests_utils.py → tests/tests_utils.py
diff --git a/spirit/tests/tests_utils_models.py → tests/tests_utils_models.py b/spirit/tests/tests_utils_models.py → tests/tests_utils_models.py
@@ -4,7 +4,7 @@
 
 from django.test import TestCase
 
-from spirit.tests.models.auto_slug import AutoSlugPopulateFromModel, AutoSlugModel, AutoSlugDefaultModel, \
+from .models.auto_slug import AutoSlugPopulateFromModel, AutoSlugModel, AutoSlugDefaultModel, \
     AutoSlugBadPopulateFromModel
 
 

diff --git a/spirit/tests/tests_utils_paginator.py → tests/tests_utils_paginator.py b/spirit/tests/tests_utils_paginator.py → tests/tests_utils_paginator.py
diff --git a/spirit/tests/tests_utils_ratelimit.py → tests/tests_utils_ratelimit.py b/spirit/tests/tests_utils_ratelimit.py → tests/tests_utils_ratelimit.py
diff --git a/spirit/tests/utils.py → tests/utils.py b/spirit/tests/utils.py → tests/utils.py