diff options
| -rw-r--r-- | runtests.py | 24 | ||||
| -rw-r--r-- | setup.cfg | 5 |
2 files changed, 17 insertions, 12 deletions
diff --git a/runtests.py b/runtests.py index b42e346..dbf6bf7 100644 --- a/runtests.py +++ b/runtests.py @@ -17,13 +17,13 @@ if not settings.configured: DATABASE_ENGINE='sqlite3', DATABASES={ 'default': { + 'NAME': ':memory:', 'ENGINE': 'django.db.backends.sqlite3', - 'TEST_NAME': 'sentry_tests.db', + 'TEST_NAME': ':memory:', }, }, - # HACK: this fixes our threaded runserver remote tests - # DATABASE_NAME='test_sentry', - TEST_DATABASE_NAME='sentry_tests.db', + DATABASE_NAME=':memory:', + TEST_DATABASE_NAME=':memory:', INSTALLED_APPS=[ 'django.contrib.auth', 'django.contrib.admin', @@ -52,7 +52,7 @@ if not settings.configured: import djcelery djcelery.setup_loader() -from django_nose import NoseTestSuiteRunner +# from django_nose import NoseTestSuiteRunner def runtests(*test_args, **kwargs): @@ -67,9 +67,11 @@ def runtests(*test_args, **kwargs): sys.exit(failures) if __name__ == '__main__': - parser = OptionParser() - parser.add_option('--verbosity', dest='verbosity', action='store', default=1, type=int) - parser.add_options(NoseTestSuiteRunner.options) - (options, args) = parser.parse_args() - - runtests(*args, **options.__dict__) + import pytest + pytest.main(sys.argv) + # parser = OptionParser() + # parser.add_option('--verbosity', dest='verbosity', action='store', default=1, type=int) + # parser.add_options(NoseTestSuiteRunner.options) + # (options, args) = parser.parse_args() + + # runtests(*args, **options.__dict__) @@ -1,2 +1,5 @@ [nosetests] -exclude=^(start|stop)_test_server
\ No newline at end of file +exclude=^(start|stop)_test_server + +[pytest] +python_files=test*.py |