Bug 1320938 - Backout debugging code from 42722bb6b23c. r=dustin
authorArmen Zambrano <armenzg@mozilla.com>
Tue, 29 Nov 2016 08:48:00 -0500
changeset 324791 093f781b5d6f11ce039bc0655b566646e4d4e92a
parent 324790 c46aadcf745c1ae266a1633c900dba9df449a41b
child 324792 12db8198fa96e1620648583ca1d06a7ef97fb18d
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersdustin
bugs1320938
milestone53.0a1
Bug 1320938 - Backout debugging code from 42722bb6b23c. r=dustin MozReview-Commit-ID: 4bu7ZAEiae1
testing/mozharness/mozharness/base/script.py
--- a/testing/mozharness/mozharness/base/script.py
+++ b/testing/mozharness/mozharness/base/script.py
@@ -389,21 +389,16 @@ class ScriptMixin(PlatformMixin):
         # * Bug 1301807 - BadStatusLine: ''
         #
         # Bug 1309912 - Adding timeout in hopes to solve blocking on response.read() (bug 1300413)
         response = urllib2.urlopen(request, timeout=30)
 
         if parsed_url.scheme in ('http', 'https'):
             expected_file_size = int(response.headers.get('Content-Length'))
 
-        self.info('Http code: {}'.format(response.getcode()))
-        for k in sorted(response.headers.keys()):
-            if k.lower().startswith('x-amz-') or k in ('Content-Encoding', 'Content-Type', 'via'):
-                self.info('{}: {}'.format(k, response.headers.get(k)))
-
         file_contents = response.read()
         obtained_file_size = len(file_contents)
         self.info('Expected file size: {}'.format(expected_file_size))
         self.info('Obtained file size: {}'.format(obtained_file_size))
 
         if obtained_file_size != expected_file_size:
             raise FetchedIncorrectFilesize(
                 'The expected file size is {} while we got instead {}'.format(
@@ -683,19 +678,18 @@ class ScriptMixin(PlatformMixin):
         )
 
         # 2) We're guaranteed to have download the file with error_level=FATAL
         #    Let's unpack the file
         function, kwargs = _determine_extraction_method_and_kwargs(url)
         try:
             function(**kwargs)
         except zipfile.BadZipfile:
-            # Bug 1306189 - Sometimes a good download turns out to be a
-            # corrupted zipfile. Let's create a signature that is easy to match
-            self.fatal('Check bug 1306189 for details on downloading a truncated zip file.')
+            # Dump the exception and exit
+            self.exception(level=FATAL)
 
 
     def load_json_url(self, url, error_level=None, *args, **kwargs):
         """ Returns a json object from a url (it retries). """
         contents = self._retry_download(
             url=url, error_level=error_level, *args, **kwargs
         )
         return json.loads(contents.read())