diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-02 09:58:07 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-02 10:40:25 -0600 |
| commit | 2a398269923b779b63ca8432b6d98dc2ae6c6a50 (patch) | |
| tree | 3b946679a96442d2b0d3081a40624db124a7c1a9 /askbot/tests/__init__.py | |
| parent | f1eda1494b753b052c82811419aff8380520ec85 (diff) | |
| parent | 8559f348eab0f59aa32d037a43d4a730112bab3c (diff) | |
| download | askbot-2a398269923b779b63ca8432b6d98dc2ae6c6a50.tar.gz askbot-2a398269923b779b63ca8432b6d98dc2ae6c6a50.tar.bz2 askbot-2a398269923b779b63ca8432b6d98dc2ae6c6a50.zip | |
Merge branch 'master' into haystack
Conflicts:
askbot/models/__init__.py
askbot/models/question.py
askbot/setup_templates/settings.py
askbot/setup_templates/settings.py.mustache
askbot/tests/__init__.py
askbot/tests/badge_tests.py
askbot/tests/db_api_tests.py
askbot/views/commands.py
askbot/views/readers.py
askbot/views/users.py
askbot/views/writers.py
Diffstat (limited to 'askbot/tests/__init__.py')
| -rw-r--r-- | askbot/tests/__init__.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/askbot/tests/__init__.py b/askbot/tests/__init__.py index 1b8b703a..96ba2045 100644 --- a/askbot/tests/__init__.py +++ b/askbot/tests/__init__.py @@ -10,9 +10,14 @@ from askbot.tests.management_command_tests import * from askbot.tests.search_state_tests import * from askbot.tests.form_tests import * from askbot.tests.follow_tests import * -from askbot.tests.templatefilter_tests import * from askbot.tests.markup_test import * -from askbot.tests.misc_tests import * from askbot.tests.post_model_tests import * +from askbot.tests.thread_model_tests import * from askbot.tests.reply_by_email_tests import * from askbot.tests.haystack_search_tests import * +from askbot.tests.email_parsing_tests import * +from askbot.tests.widget_tests import * +from askbot.tests.category_tree_tests import CategoryTreeTests +from askbot.tests.user_model_tests import UserModelTests +from askbot.tests.utils_tests import * +from askbot.tests.view_context_tests import * |