Browse Source

Pulled tests out of Sentry namespace (fixes #116)

David Cramer 13 years ago
parent
commit
87c763b1c0

+ 4 - 0
CHANGES

@@ -1,3 +1,7 @@
+1.8.5
+
+* Pulled test suite out of the Sentry namespace to avoid conflicts in projects.
+
 1.8.4.2
 
 * Added missing invalid_message_id template.

+ 1 - 1
example_project/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',
-    url(r'^', include('sentry.tests.urls')),
+    url(r'^', include('sentry.web.urls')),
 )

+ 2 - 3
runtests.py

@@ -42,8 +42,7 @@ if not settings.configured:
             'sentry.plugins.sentry_urls',
             'sentry.plugins.sentry_redmine',
 
-            # No fucking idea why I have to do this
-            'sentry.tests',
+            'tests',
         ],
         ROOT_URLCONF='',
         DEBUG=False,
@@ -74,7 +73,7 @@ def runtests(*test_args, **kwargs):
         patch_for_test_db_setup()
 
     if not test_args:
-        test_args = ['sentry']
+        test_args = ['tests']
     parent = dirname(abspath(__file__))
     sys.path.insert(0, parent)
     failures = run_tests(test_args, verbosity=kwargs.get('verbosity', 1), interactive=kwargs.get('interactive', False), failfast=kwargs.get('failfast'))

+ 1 - 1
sentry/plugins/sentry_redmine/tests/__init__.py

@@ -20,7 +20,7 @@ from sentry.plugins.sentry_redmine.models import CreateRedmineIssue, RedmineIssu
 
 class CreateIssueTest(TestCase):
     fixtures = ['sentry/plugins/sentry_redmine/tests/fixtures/regression.json']
-    urls = 'sentry.urls'
+    urls = 'sentry.web.urls'
 
     def setUp(self):
         self.user = User(username="admin", email="admin@localhost", is_staff=True, is_superuser=True)

+ 0 - 2
sentry/tests/__init__.py

@@ -1,2 +0,0 @@
-from sentry.tests.tests import *
-from sentry.tests.models import *

+ 0 - 14
sentry/tests/urls.py

@@ -1,14 +0,0 @@
-from django.conf.urls.defaults import *
-from django.contrib import admin
-
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^trigger-500$', 'sentry.tests.views.raise_exc', name='sentry-raise-exc'),
-    url(r'^trigger-500-decorated$', 'sentry.tests.views.decorated_raise_exc', name='sentry-raise-exc-decor'),
-    url(r'^trigger-500-django$', 'sentry.tests.views.django_exc', name='sentry-django-exc'),
-    url(r'^trigger-500-template$', 'sentry.tests.views.template_exc', name='sentry-template-exc'),
-    url(r'^trigger-500-log-request$', 'sentry.tests.views.logging_request_exc', name='sentry-log-request-exc'),
-    url(r'', include('sentry.web.urls')),
-)

+ 3 - 3
setup.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
 try:
-    from setuptools import setup, find_packages
+    from setuptools import setup, find_packages, Command
 except ImportError:
     from ez_setup import use_setuptools
     use_setuptools()
-    from setuptools import setup, find_packages
+    from setuptools import setup, find_packages, Command
 
 tests_require = [
     'Django>=1.2,<1.4',
@@ -39,7 +39,7 @@ except ImportError:
 
 setup(
     name='django-sentry',
-    version='1.8.4.2',
+    version='1.8.5',
     author='David Cramer',
     author_email='dcramer@gmail.com',
     url='http://github.com/dcramer/django-sentry',

+ 1 - 0
tests/__init__.py

@@ -0,0 +1 @@
+VERSION = 1.0

+ 0 - 0
sentry/tests/fixtures/bad_data.json → tests/fixtures/bad_data.json


+ 0 - 0
sentry/tests/fixtures/cleanup.json → tests/fixtures/cleanup.json


Some files were not shown because too many files changed in this diff