Brought the rest of the Django client tests up to passing

Author: dcramer

runtests.py

@@ -4,7 +4,9 @@
 from os.path import dirname, abspath, join
 from optparse import OptionParser
 
-sys.path.insert(0, dirname(abspath(__file__)))
+where_am_i = dirname(abspath(__file__))
+
+sys.path.insert(0, where_am_i)
 
 logging.getLogger('sentry').addHandler(logging.StreamHandler())
 
@@ -45,6 +47,7 @@
         BROKER_VHOST="/",
         CELERY_ALWAYS_EAGER=True,
         TEMPLATE_DEBUG=True,
+        TEMPLATE_DIRS=[join(where_am_i, 'tests', 'contrib', 'django', 'templates')],
     )
     import djcelery
     djcelery.setup_loader()

sentry_client/base.py

@@ -48,7 +48,9 @@ def process(self, **kwargs):
         kwargs.setdefault('level', logging.ERROR)
         kwargs.setdefault('server_name', settings.NAME)
 
-        versions = get_versions()
+        modules = settings.INCLUDE_PATHS
+
+        versions = get_versions(modules)
         kwargs['data']['__sentry__']['versions'] = versions
 
         # Shorten lists/strings
@@ -59,9 +61,6 @@ def process(self, **kwargs):
 
         # if we've passed frames, lets try to fetch the culprit
         if not kwargs.get('view') and kwargs['data']['__sentry__'].get('frames'):
-            # This should be cached
-            modules = settings.INCLUDE_PATHS
-
             # We iterate through each frame looking for an app in INSTALLED_APPS
             # When one is found, we mark it as last "best guess" (best_guess) and then
             # check it against SENTRY_EXCLUDE_PATHS. If it isnt listed, then we
@@ -104,7 +103,7 @@ def process(self, **kwargs):
                 })
 
         if 'checksum' not in kwargs:
-            checksum = construct_checksum(**kwargs)
+            kwargs['checksum'] = checksum = construct_checksum(**kwargs)
         else:
             checksum = kwargs['checksum']
 

sentry_client/contrib/django/__init__.py

@@ -29,6 +29,9 @@ def process(self, **kwargs):
             else:
                 post_data = request.POST
 
+            if 'data' not in kwargs:
+                kwargs['data'] = {}
+
             kwargs['data'].update(dict(
                 META=request.META,
                 POST=post_data,
@@ -77,6 +80,9 @@ def create_from_exception(self, exc_info=None, **kwargs):
 
         data = kwargs.pop('data', {}) or {}
 
+        if '__sentry__' not in data:
+            data['__sentry__'] = {}
+
         try:
             exc_type, exc_value, exc_traceback = exc_info
 

sentry_client/contrib/django/middleware.py

@@ -33,7 +33,7 @@ class SentryResponseErrorIdMiddleware(object):
     def process_response(self, request, response):
         if not getattr(request, 'sentry', None):
             return response
-        response['X-Sentry-ID'] = request.sentry['id']
+        response['X-Sentry-ID'] = '$'.join(request.sentry['id'])
         return response
 
 class SentryLogMiddleware(object):

sentry_client/utils/__init__.py

@@ -69,7 +69,10 @@ def get_versions(module_list=None):
     versions = {}
     for module_name in ext_module_list:
         if module_name not in _VERSION_CACHE:
-            __import__(module_name)
+            try:
+                __import__(module_name)
+            except ImportError:
+                continue
             app = sys.modules[module_name]
             if hasattr(app, 'get_version'):
                 get_version = app.get_version

tests/templates/404.html tests/contrib/django/templates/404.htmltests/templates/404.html renamed to tests/contrib/django/templates/404.html

@@ -0,0 +1 @@
+{% invalid template tag %}