Adding and if-heavy aware integration test

tools/chrome_proxy/webdriver/common.py

 # Copyright 2016 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 argparse
 import json
 import logging
 import os
 import re
 import socket
@@ skipping 568 matching lines @@
     """
     if 'via' in http_response.response_headers:
       expected_via_header = ParseFlags().via_header_value
       actual_via_headers = http_response.response_headers['via'].split(',')
       self.assertNotIn(expected_via_header, actual_via_headers, "Via header "
         "found in response headers! Not expected: %s, Actual: %s" %
         (expected_via_header, actual_via_headers))
 
   def checkLoFiResponse(self, http_response, expected_lo_fi):
     """Asserts that if expected the response headers contain the Lo-Fi directive
-    then the request headers do too. Also checks that the content size is less
-    than 100 if |expected_lo_fi|. Otherwise, checks that the response and
-    request headers don't contain the Lo-Fi directive and the content size is
-    greater than 100.
+    then the request headers do too. If the CPAT header contains if-heavy, the

[bengr, 2017/04/27 18:45:49]

Note somewhere that 'if-heavy' is being deprecated.

[RyanSturm, 2017/04/27 18:50:32]

Done.

+    request should not be LoFi. Also checks that the content size is less than
+    100 if |expected_lo_fi|. Otherwise, checks that the response and request
+    headers don't contain the Lo-Fi directive and the content size is greater
+    than 100.
 
     Args:
       http_response: The HTTPResponse object to check.
       expected_lo_fi: Whether the response should be Lo-Fi.
 
     Returns:
       Whether the response was Lo-Fi.
     """
 
     if (expected_lo_fi) :
       self.assertHasChromeProxyViaHeader(http_response)
       content_length = http_response.response_headers['content-length']
       cpat_request = http_response.request_headers[
                        'chrome-proxy-accept-transform']
       cpct_response = http_response.response_headers[
                         'chrome-proxy-content-transform']
       if ('empty-image' in cpct_response):
         self.assertIn('empty-image', cpat_request)
         self.assertTrue(int(content_length) < 100)
         return True;
       return False;
     else:
-      self.assertNotIn('chrome-proxy-accept-transform',
-        http_response.request_headers)
+      if ('chrome-proxy-accept-transform' in http_response.request_headers):
+        cpat_request = http_response.request_headers[
+                       'chrome-proxy-accept-transform']
+        if ('empty-image' in cpat_request):
+          self.assertIn('if-heavy', cpat_request)
       self.assertNotIn('chrome-proxy-content-transform',
         http_response.response_headers)
       content_length = http_response.response_headers['content-length']
       self.assertTrue(int(content_length) > 100)
       return False;
 
   def checkLitePageResponse(self, http_response):
     """Asserts that if the response headers contain the Lite Page directive then
     the request headers do too.
 
@@ skipping 42 matching lines @@
     for test_suite in test_suite_iter:
       for test_case in test_suite:
         for test in test_case:
           # Drop the file name in the form <filename>.<classname>.<methodname>
           test_id = test.id()[test.id().find('.') + 1:]
           if re.match(test_filter_re, test_id):
             tests.addTest(test)
     testRunner = unittest.runner.TextTestRunner(verbosity=2,
       failfast=flags.failfast, buffer=(not flags.disable_buffer))
     testRunner.run(tests)