Add protocol and port to HTTPResponse.

tools/chrome_proxy/webdriver/common.py

Index: tools/chrome_proxy/webdriver/common.py
diff --git a/tools/chrome_proxy/webdriver/common.py b/tools/chrome_proxy/webdriver/common.py
index 60cdd7d07e468c710d6ca88381de2de87479109d..6aca1334e0b4333725056bbe2e629798e0ec4b35 100644
--- a/tools/chrome_proxy/webdriver/common.py
+++ b/tools/chrome_proxy/webdriver/common.py
@@ -42,6 +42,16 @@ def ParseFlags():
   parser.add_argument('chrome_driver', nargs=1, type=str, help='The path to '
     'the ChromeDriver executable. If not given, the default system chrome '
     'will be used.')
+  parser.add_argument('-b', '--buffer', help='The standard output and standard '

[RyanSturm, 2016/12/13 21:30:11]

These are awesome. Can you make the buffer one default, and change the flag to
disable it instead?

--disable_buffer maybe

[Robert Ogden, 2016/12/13 21:51:26]

Done.

+    'error streams are buffered during the test run. Output during a passing '
+    'test is discarded. Output is echoed normally on test fail or error and is '
+    'added to the failure messages.', action='store_true')
+  parser.add_argument('-c', '--catch', help='Control-C during the test run '
+    'waits for the current test to end and then reports all the results so '
+    'far. A second Control-C raises the normal KeyboardInterrupt exception.',
+    action='store_true')
+  parser.add_argument('-f', '--failfast', help='Stop the test run on the first '
+    'error or failure.', action='store_true')
   # TODO(robertogden): Log sys.argv here.
   return parser.parse_args(sys.argv[1:])
 
@@ -309,11 +319,17 @@ class TestDriver:
       params = log_dict['params']
       response_dict = params['response']
       http_response_dict = {
-        'response_headers': response_dict['headers'],
-        'request_headers': response_dict['requestHeaders'],
-        'url': response_dict['url'],
-        'status': response_dict['status'],
-        'request_type': params['type']
+        'response_headers': response_dict['headers'] if 'headers' in
+          response_dict else {},
+        'request_headers': response_dict['requestHeaders'] if 'requestHeaders'
+          in response_dict else {},
+        'url': response_dict['url'] if 'url' in response_dict else '',
+        'protocol': response_dict['protocol'] if 'protocol' in response_dict
+          else '',
+        'port': response_dict['remotePort'] if 'remotePort' in response_dict
+          else -1,
+        'status': response_dict['status'] if 'status' in response_dict else -1,
+        'request_type': params['type'] if 'type' in params else ''
       }
       return HTTPResponse(**http_response_dict)
     all_responses = []
@@ -335,16 +351,20 @@ class HTTPResponse:
     _response_headers: A dict of response headers.
     _request_headers: A dict of request headers.
     _url: the fetched url
+    _protocol: The protocol used to get the response.
+    _port: The remote port number used to get the response.
     _status: The integer status code of the response
     _request_type: What caused this request (Document, XHR, etc)
     _flags: A Namespace object from ParseFlags()
   """
 
-  def __init__(self, response_headers, request_headers, url, status,
-      request_type):
+  def __init__(self, response_headers, request_headers, url, protocol, port,
+      status, request_type):
     self._response_headers = response_headers
     self._request_headers = request_headers
     self._url = url
+    self._protocol = protocol
+    self._port = port
     self._status = status
     self._request_type = request_type
     self._flags = ParseFlags()
@@ -354,6 +374,8 @@ class HTTPResponse:
       'response_headers': self._response_headers,
       'request_headers': self._request_headers,
       'url': self._url,
+      'protocol': self._protocol,
+      'port': self._port,
       'status': self._status,
       'request_type': self._request_type
     }
@@ -372,6 +394,14 @@ class HTTPResponse:
     return self._url
 
   @property
+  def protocol(self):
+    return self._protocol
+
+  @property
+  def port(self):
+    return self._port
+
+  @property
   def status(self):
     return self._status
 
@@ -385,3 +415,9 @@ class HTTPResponse:
 
   def WasXHR(self):
     return self.request_type == 'XHR'
+
+  def UsedHTTP(self):
+    return self._protocol == 'http/1.1'
+
+  def UsedHTTP2(self):
+    return self._protocol == 'h2'