Commit fa6d94d1 by John Eskew

Remove NoseTestSuiteRunner - now using pytest.

parent 2fafa546
...@@ -923,9 +923,6 @@ INSTALLED_APPS = [ ...@@ -923,9 +923,6 @@ INSTALLED_APPS = [
# Monitor the status of services # Monitor the status of services
'openedx.core.djangoapps.service_status', 'openedx.core.djangoapps.service_status',
# Testing
'django_nose',
# Bookmarks # Bookmarks
'openedx.core.djangoapps.bookmarks', 'openedx.core.djangoapps.bookmarks',
......
...@@ -45,9 +45,6 @@ MONGO_HOST = os.environ.get('EDXAPP_TEST_MONGO_HOST', 'localhost') ...@@ -45,9 +45,6 @@ MONGO_HOST = os.environ.get('EDXAPP_TEST_MONGO_HOST', 'localhost')
THIS_UUID = uuid4().hex[:5] THIS_UUID = uuid4().hex[:5]
# Nose Test Runner
TEST_RUNNER = 'openedx.core.djangolib.nose.NoseTestSuiteRunner'
_SYSTEM = 'cms' _SYSTEM = 'cms'
_REPORT_DIR = REPO_ROOT / 'reports' / _SYSTEM _REPORT_DIR = REPO_ROOT / 'reports' / _SYSTEM
......
...@@ -2090,7 +2090,6 @@ INSTALLED_APPS = [ ...@@ -2090,7 +2090,6 @@ INSTALLED_APPS = [
# For testing # For testing
'django.contrib.admin', # only used in DEBUG mode 'django.contrib.admin', # only used in DEBUG mode
'django_nose',
'debug', 'debug',
'django_extensions', 'django_extensions',
......
...@@ -91,9 +91,6 @@ PARENTAL_CONSENT_AGE_LIMIT = 13 ...@@ -91,9 +91,6 @@ PARENTAL_CONSENT_AGE_LIMIT = 13
# Makes the tests run much faster... # Makes the tests run much faster...
SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead
# Nose Test Runner
TEST_RUNNER = 'openedx.core.djangolib.nose.NoseTestSuiteRunner'
_SYSTEM = 'lms' _SYSTEM = 'lms'
_REPORT_DIR = REPO_ROOT / 'reports' / _SYSTEM _REPORT_DIR = REPO_ROOT / 'reports' / _SYSTEM
......
"""
Utilities related to nose.
"""
import django_nose
from django.core.management import call_command
from django.db import DEFAULT_DB_ALIAS, connections, transaction
class NoseTestSuiteRunner(django_nose.NoseTestSuiteRunner):
"""Custom NoseTestSuiteRunner."""
def setup_databases(self):
""" Setup databases and then flush to remove data added by migrations. """
return_value = super(NoseTestSuiteRunner, self).setup_databases()
# Delete all data added by data migrations. Unit tests should setup their own data using factories.
call_command('flush', verbosity=0, interactive=False, load_initial_data=False)
# Through Django 1.8, auto increment sequences are not reset when calling flush on a SQLite db.
# So we do it ourselves.
# http://sqlite.org/autoinc.html
connection = connections[DEFAULT_DB_ALIAS]
if connection.vendor == 'sqlite' and not connection.features.supports_sequence_reset:
with transaction.atomic(using=DEFAULT_DB_ALIAS):
cursor = connection.cursor()
cursor.execute(
"delete from sqlite_sequence;"
)
return return_value
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment