Adding origin timeout integration test

tools/chrome_proxy/webdriver/bypass.py

 # Copyright 2017 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 common
 from common import TestDriver
 from common import IntegrationTest
 
 
 class Bypass(IntegrationTest):
@@ skipping 28 matching lines @@
 
   # Ensure Chrome does not use Data Saver for HTTPS requests.
   def testHttpsBypass(self):
     with TestDriver() as t:
       t.AddChromeArg('--enable-spdy-proxy-auth')
 
       # Load HTTP page and check that Data Saver is used.
       t.LoadURL('http://check.googlezip.net/test.html')
       responses = t.GetHTTPResponses()
       self.assertEqual(2, len(responses))
-      for response in t.GetHTTPResponses():
+      for response in responses:
         self.assertHasChromeProxyViaHeader(response)
 
       # Load HTTPS page and check that Data Saver is not used.
       t.LoadURL('https://check.googlezip.net/test.html')
       responses = t.GetHTTPResponses()
       self.assertEqual(2, len(responses))
-      for response in t.GetHTTPResponses():
+      for response in responses:
         self.assertNotHasChromeProxyViaHeader(response)
 
   # Verify that CORS requests receive a block-once from the data reduction
   # proxy by checking that those requests are retried without data reduction
   # proxy.
   def testCorsBypass(self):
     with TestDriver() as test_driver:
       test_driver.AddChromeArg('--enable-spdy-proxy-auth')
       test_driver.LoadURL('http://www.gstatic.com/chrome/googlezip/cors/')
 
       # Navigate to a different page to verify that later requests are not
       # blocked.
       test_driver.LoadURL('http://check.googlezip.net/test.html')
 
       cors_requests = 0
       same_origin_requests = 0
       for response in test_driver.GetHTTPResponses():
         # The origin header implies that |response| is a CORS request.
         if ('origin' not in response.request_headers):
           self.assertHasChromeProxyViaHeader(response)
           same_origin_requests = same_origin_requests + 1
         else:
           self.assertNotHasChromeProxyViaHeader(response)
           cors_requests = cors_requests + 1
       # Verify that both CORS and same origin requests were seen.
       self.assertNotEqual(0, same_origin_requests)
       self.assertNotEqual(0, cors_requests)
 
+  # Verify that when an origin times out using Data Saver, the request bypassed.

[tbansal1, 2017/02/23 21:41:13]

s/request/request is fetched directly and data saver is bypassed only for one
request/

[RyanSturm, 2017/02/23 21:47:30]

Done.

+  def testOriginTimeoutBypass(self):

[tbansal1, 2017/02/23 21:41:13]

may be change test name to testOriginTimeoutBlockOnce since the test is really
testing for block-once rather than bypass (which could be longer).

[RyanSturm, 2017/02/23 21:47:30]

Done.

+    with TestDriver() as test_driver:
+      test_driver.AddChromeArg('--enable-spdy-proxy-auth')
+
+      # Load URL that times out when the proxy server tries to access it.
+      test_driver.LoadURL('http://chromeproxy-test.appspot.com/blackhole')
+      responses = test_driver.GetHTTPResponses()
+      self.assertNotEqual(1, len(responses))

[Robert Ogden, 2017/02/23 21:50:46]

Pretty sure this should be assert equals. This assertion fails on my machine.

[tbansal1, 2017/02/23 21:56:14]

A safer check might be assertNotEqual(0, ...)
so the test does not depend too much on the structure of the webpage.

[RyanSturm, 2017/02/23 22:03:05]

It was supposed to be a 0, changed it somehow. Good catch.

+      for response in responses:
+          self.assertNotHasChromeProxyViaHeader(response)
+
+      # Load HTTP page and check that Data Saver is used.
+      test_driver.LoadURL('http://check.googlezip.net/test.html')
+      responses = test_driver.GetHTTPResponses()
+      self.assertEqual(2, len(responses))
+      for response in responses:
+        self.assertHasChromeProxyViaHeader(response)
+
+
 if __name__ == '__main__':
   IntegrationTest.RunAllTests()