add test for catching manifest viewer tracebacks - thanks, @robhudson!…

… (bug 784000)

mkt/reviewers/tests/test_views.py

@@ -11,6 +11,7 @@
 import waffle
 from nose.tools import eq_, ok_
 from pyquery import PyQuery as pq
+import requests
 
 import amo
 import reviews
@@ -965,6 +966,23 @@ def test_manifest_json_unicode(self, mock_get):
         eq_(json.loads(r.content), {'content': u'كك some foreign ish',
                                     'headers': {}})
 
+    @mock.patch('mkt.reviewers.views.requests.get')
+    def test_manifest_json_traceback_in_response(self, mock_get):
+        m = mock.Mock()
+        m.content = {'name': 'Some name'}
+        m.headers = {}
+        mock_get.side_effect = requests.exceptions.SSLError
+        mock_get.return_value = m
+
+        # We should not 500 on a traceback.
+
+        r = self.client.get(reverse('reviewers.apps.review.manifest',
+                                    args=[self.app.app_slug]))
+        eq_(r.status_code, 200)
+        data = json.loads(r.content)
+        assert data['content'], 'There should be a content with the traceback'
+        eq_(data['headers'], {})
+
     def test_abuse(self):
         AbuseReport.objects.create(addon=self.app, message='!@#$')
         res = self.client.get(self.url)

mkt/reviewers/views.py

@@ -1,5 +1,7 @@
 import datetime
 import json
+import sys
+import traceback
 
 from django.conf import settings
 from django.db.models import Q
@@ -317,8 +319,8 @@ def app_view_manifest(request, addon):
         try:
             req = requests.get(addon.manifest_url, verify=False)
             content, headers = req.content, req.headers
-        except Exception, e:
-            content = e
+        except Exception:
+            content = ''.join(traceback.format_exception(*sys.exc_info()))
 
         try:
             # Reindent the JSON.