Add test for failed retry.

go/apps/http_api_nostream/tests/test_vumi_app.py

@@ -884,6 +884,35 @@ def test_post_inbound_message_500_schedule_retry(self):
 
         self.assertEqual(retry_msg['message_id'], msg['message_id'])
 
+    @inlineCallbacks
+    def test_post_inbound_message_500_schedule_retry_failed_500(self):
+        retry_url, retry_calls = yield self.start_retry_server()
+        yield self.start_app_worker({
+            'http_retry_api': retry_url,
+        })
+        msg_d = self.app_helper.make_dispatch_inbound(
+            'in 1', message_id='1', conv=self.conversation)
+
+        # return 500 response to message push
+        req = yield self.push_calls.get()
+        req.setResponseCode(500)
+        req.finish()
+
+        # catch and check retry
+        retry = yield retry_calls.get()
+        retry_data = retry.content.read()
+        retry.setResponseCode(500)
+        retry.finish()
+
+        with LogCatcher(log_level=logging.WARNING) as lc:
+            yield msg_d
+
+        self.assertEqual(lc.messages(), [
+            "Failed to schedule retry request [account: u'test-0-user'"
+            ", request: %r, response: [500, 'Internal Server Error']]"
+            % (retry_data,),
+        ])
+
     @inlineCallbacks
     def test_post_inbound_message_300_does_not_schedule_retry(self):
         retry_url, retry_calls = yield self.start_retry_server()

go/apps/http_api_nostream/vumi_app.py

@@ -320,12 +320,12 @@ def schedule_push_retry(self, user_account_key, url, method, data,
                 headers=retry_headers, timeout=self.http_retry_timeout)
             if not (200 <= resp.code < 300):
                 log.warning(
-                    'Failed to schedule retry request.'
+                    'Failed to schedule retry request'
                     ' [account: %r, request: %r, response: %r]'
-                    % (user_account_key, retry_data, resp))
+                    % (user_account_key, retry_data, [resp.code, resp.phrase]))
         except Exception as err:
             log.warning(
-                'Error scheduling retry of request.'
+                'Error scheduling retry of request'
                 ' [account: %r, request: %r, error: %r]'
                 % (user_account_key, retry_data, err))
         else: