Fix empty content in AdWordsReportError

Author: xzkostyan

googleads/adwords.py

@@ -1661,11 +1661,13 @@ def _DownloadReportAsStream(self, post_body, **kwargs):
                              response.code, response.msg)
       return response
     except urllib2.HTTPError as e:
+      # Content from HTTPError instance can be read only one time.
+      error = self._ExtractError(e)
       if _report_logger.isEnabledFor(logging.WARNING):
         _report_logger.warning(
             'Request Summary: %s', self._ExtractRequestSummaryFields(
-                request, error=e))
-      raise self._ExtractError(e)
+                request, error=error))
+      raise error
 
   def _SanitizeRequestHeaders(self, headers):
     """Removes sensitive data from request headers for use in logging.
@@ -1708,7 +1710,7 @@ def _ExtractRequestSummaryFields(self, request, error=None):
     Args:
       request:  a urllib2.Request instance.
       [optional]
-      error: a urllib2.HttpError instance used to retrieve error details.
+      error: a AdWordsReportError instance used to retrieve error details.
 
     Returns:
       A dict containing the fields to be output in the summary logs.
@@ -1728,7 +1730,7 @@ def _ExtractRequestSummaryFields(self, request, error=None):
 
     if error:
       summary_fields['isError'] = True
-      summary_fields['errorMessage'] = error.read()
+      summary_fields['errorMessage'] = error.content
     else:
       summary_fields['isError'] = False
 

tests/adwords_test.py

@@ -1783,17 +1783,21 @@ def testDownloadReport_failure(self):
 
     self.marshaller.process.return_value = serialized_report
 
+    request = mock.patch(URL_REQUEST_PATH + '.Request')
+    logger = mock.patch('googleads.adwords._report_logger')
+
     with mock.patch('suds.mx.Content') as mock_content:
-      with mock.patch(URL_REQUEST_PATH + '.Request') as mock_request:
+      with request as mock_request, logger as mock_logger:
+        mock_logger.isEnabledFor.return_value = True
         mock_request_instance = mock.Mock()
         mock_request.return_value = mock_request_instance
         mock_request_instance.get_full_url.return_value = 'https://google.com/'
         mock_request_instance.headers = {}
         self.opener.open.side_effect = error
-        self.assertRaises(
-            googleads.errors.AdWordsReportError,
-            self.report_downloader.DownloadReport, report_definition,
-            output_file)
+
+        with self.assertRaises(googleads.errors.AdWordsReportError) as ex:
+          self.report_downloader.DownloadReport(report_definition, output_file)
+        self.assertEqual(ex.exception.content, report_data)
 
         mock_request.assert_called_once_with(
             ('https://adwords.google.com/api/adwords/reportdownload/%s'