diff --git a/Makefile b/Makefile index 606bf0dcc..230c0e003 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,8 @@ nb-down: # runs tests test: - docker-compose down - - CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} TEST=True docker-compose -f docker-compose.yml up -d - - CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose exec newsblur_web ./manage.py migrate --database=test_newsblur - - CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose exec newsblur_web ./manage.py loaddata config/fixtures/bootstrap.json --database=test_newsblur - - CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose -f docker-compose.yml exec newsblur_web ./manage.py test --settings=newsblur_web.test_settings + - CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} TEST=True docker-compose -f docker-compose.yml up -d newsblur_web + - CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose exec newsblur_web ./manage.py test --settings=newsblur_web.test_settings --exclude-dir=vendor keys: - rm config/certificates diff --git a/config/requirements.txt b/config/requirements.txt index 3be1298ce..11a44e38c 100755 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -10,6 +10,7 @@ django-compress==1.0.1 django-cors-middleware==1.3.1 django-extensions==2.2.9 django-mailgun==0.9.1 +django-nose==1.4.7 django-oauth-toolkit==1.2.0 django-qurl==0.1.1 django-paypal==1.0 @@ -34,6 +35,8 @@ mongoengine==0.20.0 PyMySQL==0.9.3 ndg-httpsclient==0.4.2 nltk==3.4.5 +nose==1.3.7 +nose-exclude==0.5.0 numpy==1.18.5 oauth2==1.9.0.post1 pillow==7.0.0 diff --git a/newsblur_web/__init__.py b/newsblur_web/__init__.py index ea0f0073d..08b9787e1 100644 --- a/newsblur_web/__init__.py +++ b/newsblur_web/__init__.py @@ -8,4 +8,5 @@ __all__ = ['celery_app'] import pymysql -pymysql.install_as_MySQLdb() \ No newline at end of file +pymysql.install_as_MySQLdb() +pymysql.version_info = (1, 3, 13, "final", 0) \ No newline at end of file diff --git a/newsblur_web/settings.py b/newsblur_web/settings.py index a5bf3f5d3..f3b8612a9 100644 --- a/newsblur_web/settings.py +++ b/newsblur_web/settings.py @@ -269,7 +269,7 @@ INTERNAL_IPS = ('127.0.0.1',) LOGGING_LOG_SQL = True APPEND_SLASH = False SESSION_ENGINE = 'redis_sessions.session' -TEST_RUNNER = "utils.testrunner.TestRunner" +TEST_RUNNER = "django_nose.NoseTestSuiteRunner" SESSION_COOKIE_NAME = 'newsblur_sessionid' SESSION_COOKIE_AGE = 60*60*24*365*10 # 10 years SESSION_COOKIE_DOMAIN = '.newsblur.com' @@ -338,6 +338,7 @@ INSTALLED_APPS = ( 'vendor.zebra', 'oauth2_provider', 'corsheaders', + 'django_nose', ) # ==========