Update infra_libs to 1.1.15 / 0b44aba87c1c6538439df6d24a409870810747ab

client/third_party/infra_libs/httplib2_utils.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import base64
 import collections
 import copy
+import httplib
 import json
 import logging
 import os
 import re
 import socket
 import sys
 import time
 
 import httplib2
 import oauth2client.client
@@ skipping 313 matching lines @@
     start_time = self.time_fn()
     try:
       response, content = super(InstrumentedHttp, self).request(
           uri, method, body, *args, **kwargs)
     except socket.timeout:
       self._update_metrics(http_metrics.STATUS_TIMEOUT, start_time)
       raise
     except (socket.error, socket.herror, socket.gaierror):
       self._update_metrics(http_metrics.STATUS_ERROR, start_time)
       raise
-    except httplib2.HttpLib2Error:
-      self._update_metrics(http_metrics.STATUS_EXCEPTION, start_time)
+    except (httplib.HTTPException, httplib2.HttpLib2Error) as ex:
+      status = http_metrics.STATUS_EXCEPTION
+      if 'Deadline exceeded while waiting for HTTP response' in str(ex):
+        # Raised on Appengine (gae_override/httplib.py).
+        status = http_metrics.STATUS_TIMEOUT
+      self._update_metrics(status, start_time)
       raise
     http_metrics.response_bytes.add(len(content), fields=self.fields)
 
     self._update_metrics(response.status, start_time)
 
     return response, content
 
 
 class HttpMock(object):
   """Mock of httplib2.Http"""
@@ skipping 40 matching lines @@
     self.requests_made.append(self.HttpCall(uri, method, body, headers))
     headers = None
     body = None
     for candidate in self._uris:
       if candidate[0].match(uri):
         _, headers, body = candidate
         break
     if not headers:
       raise AssertionError("Unexpected request to %s" % uri)
     return httplib2.Response(headers), body