Permalink
Browse files

change to django-nose for test running

  • Loading branch information...
1 parent f0a8670 commit 229dfd5252bb8355836c43bb800c898336e33fbc @wraithan wraithan committed Apr 22, 2013
View
3 pip_requirements.txt
@@ -9,6 +9,7 @@ django-celery==3.0.9
django-extensions==0.7.1
django-guardian==1.0.4
django-kombu==0.9.4
+django-nose==1.1
django-profiles==0.2
django-secure==0.1.2
django==1.4.3
@@ -21,7 +22,6 @@ redis==2.7.1
simplejson==2.3.0
south==0.7.6
sphinx-http-domain==0.2
-unittest-xml-reporting==1.3.1
django-gravatar2==1.0.6
slumber==0.4.2
# Required for slumber because it just pulls down "requests"
@@ -39,4 +39,3 @@ git+git://github.com/ericflo/django-pagination.git@e5f669036c#egg=django_paginat
git+git://github.com/nathanborror/django-basic-apps.git@171fdbe21a0dbbb38919a383cc265cb3cbc73771#egg=django_basic_apps-dev
git+git://github.com/nathanborror/django-registration.git@dc0b564b7bfb79f58592fe8ad836729a85ec17ae#egg=django_registration-dev
git+git://github.com/toastdriven/django-tastypie.git@c5451b90b18b0cb64841b2276d543230d5f58231#egg=django_tastypie-dev
-
View
11 readthedocs/rtd_tests/tests/__init__.py
@@ -1,11 +0,0 @@
-from test_api import * # noqa
-from view_tests import * # noqa
-from test_doc_building import * # noqa
-from test_backend import * # noqa
-from test_celery import * # noqa
-from test_hacks import * # noqa
-from test_post_commit_hooks import * # noqa
-from test_privacy import * # noqa
-from test_middlware import * # noqa
-from test_redirects import * # noqa
-from test_urls import * # noqa
View
1 readthedocs/settings/base.py
@@ -116,6 +116,7 @@
'djangosecure',
'guardian',
'django_gravatar',
+ 'django_nose',
# Celery bits
'djcelery',
View
5 readthedocs/settings/onebox.py
@@ -40,10 +40,7 @@
SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTOCOL", "https")
SESSION_COOKIE_DOMAIN = None
-TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner'
-TEST_OUTPUT_VERBOSE = True
-TEST_OUTPUT_DESCRIPTIONS = True
-TEST_OUTPUT_DIR = os.path.join(SITE_ROOT, 'xml_output')
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
SLUMBER_USERNAME = 'test'
SLUMBER_PASSWORD = 'test'
View
2 readthedocs/settings/postgres.py
@@ -5,7 +5,7 @@
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'docs',
- 'USER': 'postgres', # Not used with sqlite3.
+ 'USER': 'postgres', # Not used with sqlite3.
'PASSWORD': '',
'HOST': '10.177.73.97',
'PORT': '',
View
5 readthedocs/settings/sqlite.py
@@ -22,10 +22,7 @@
SESSION_COOKIE_DOMAIN = None
CACHE_BACKEND = 'dummy://'
-TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner'
-TEST_OUTPUT_VERBOSE = True
-TEST_OUTPUT_DESCRIPTIONS = True
-TEST_OUTPUT_DIR = os.path.join(SITE_ROOT, 'xml_output')
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
SLUMBER_USERNAME = 'test'
SLUMBER_PASSWORD = 'test'

0 comments on commit 229dfd5

Please sign in to comment.