Browse Source

Improve test extensions

- Remove warnings-as-errors from extension
- Move middleware into testutils
David Cramer 10 years ago
parent
commit
27983b7a4d
3 changed files with 6 additions and 9 deletions
  1. 5 5
      conftest.py
  2. 0 0
      src/sentry/testutils/middleware.py
  3. 1 4
      src/sentry/utils/pytest.py

+ 5 - 5
conftest.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import
 
-import sys
-import os.path
-
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'src'))
-
 pytest_plugins = [
     'sentry.utils.pytest'
 ]
+
+
+def pytest_configure(config):
+    import warnings
+    warnings.filterwarnings('error', '', Warning, r'(sentry|raven)')

+ 0 - 0
tests/middleware.py → src/sentry/testutils/middleware.py


+ 1 - 4
src/sentry/utils/pytest.py

@@ -7,9 +7,6 @@ from django.conf import settings
 
 
 def pytest_configure(config):
-    import warnings
-    warnings.filterwarnings('error', '', Warning, r'(sentry|raven)')
-
     if not settings.configured:
         os.environ['DJANGO_SETTINGS_MODULE'] = 'sentry.conf.server'
 
@@ -70,7 +67,7 @@ def pytest_configure(config):
     # to assert that the user is always in sudo mode
     middleware = list(settings.MIDDLEWARE_CLASSES)
     sudo = middleware.index('sentry.middleware.sudo.SudoMiddleware')
-    middleware[sudo] = 'tests.middleware.SudoMiddleware'
+    middleware[sudo] = 'sentry.testutils.middleware.SudoMiddleware'
     settings.MIDDLEWARE_CLASSES = tuple(middleware)
 
     # enable draft features