Reduce DRP telemetry tests' dependence on net-internals#proxy.

tools/chrome_proxy/integration_tests/chrome_proxy_metrics.py

 # Copyright 2014 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 datetime
 import logging
 import os
 
 from integration_tests import network_metrics
 from telemetry.core import util
@@ skipping 335 matching lines @@
   def AddResultsForBypass(self, tab, results):
     bypass_count = 0
     for resp in self.IterResponses(tab):
       if resp.HasChromeProxyViaHeader():
         r = resp.response
         raise ChromeProxyMetricException, (
             '%s: Should not have Via header (%s) (refer=%s, status=%d)' % (
                 r.url, r.GetHeader('Via'), r.GetHeader('Referer'), r.status))
       bypass_count += 1
 
-    self.VerifyAllProxiesBypassed(tab)

[bolian, 2014/12/09 22:06:14]

Not verifying this any more?

[sclittle, 2014/12/09 22:25:21]

Not anymore. The only thing this call gains us here is to check how long the
proxy is bypassed for, so we can verify that the bypass is for 1-5 minutes. The
justification here is that this test doesn't really need to do that in order to
verify that bypass is working, since we already check that the responses don't
have the via headers.

     results.AddValue(scalar.ScalarValue(
         results.current_page, 'bypass', 'count', bypass_count))
 
   def AddResultsForCorsBypass(self, tab, results):
     eligible_response_count = 0
     bypass_count = 0
     bypasses = {}
     for resp in self.IterResponses(tab):
       logging.warn('got a resource %s' % (resp.response.url))
 
@@ skipping 30 matching lines @@
 
   def AddResultsForBlockOnce(self, tab, results):
     eligible_response_count = 0
     bypass_count = 0
     for resp in self.IterResponses(tab):
       if resp.ShouldHaveChromeProxyViaHeader():
         eligible_response_count += 1
         if not resp.HasChromeProxyViaHeader():
           bypass_count += 1
 
-    if tab:
-      info = GetProxyInfoFromNetworkInternals(tab)
-      if not info['enabled']:
-        raise ChromeProxyMetricException, (
-            'Chrome proxy should be enabled. proxy info: %s' % info)
-      self.VerifyBadProxies(info['badProxies'], [])
-
     if eligible_response_count <= 1:
       raise ChromeProxyMetricException, (
           'There should be more than one DRP eligible response '
           '(eligible_response_count=%d, bypass_count=%d)\n' % (
               eligible_response_count, bypass_count))
     elif bypass_count != 1:
       raise ChromeProxyMetricException, (
           'Exactly one response should be bypassed. '
           '(eligible_response_count=%d, bypass_count=%d)\n' % (
               eligible_response_count, bypass_count))
@@ skipping 48 matching lines @@
           str(bad_proxies), str(expected_bad_proxies)))
 
   def AddResultsForHTTPFallback(
       self, tab, results, expected_proxies=None, expected_bad_proxies=None):
     if not expected_proxies:
       expected_proxies = [self.effective_proxies['fallback'],
                           self.effective_proxies['direct']]
     if not expected_bad_proxies:
       expected_bad_proxies = []
 
+    # TODO(sclittle): Remove this dependency on net-internals#proxy once an
+    # alternative method of verifying that Chrome is on the fallback proxy
+    # exists.
     self.VerifyProxyInfo(tab, expected_proxies, expected_bad_proxies)
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'http_fallback', 'boolean', True))
 
   def AddResultsForHTTPToDirectFallback(self, tab, results):
-    self.VerifyAllProxiesBypassed(tab)
+    bypass_count = 0
+    for resp in self.IterResponses(tab):
+      if resp.HasChromeProxyViaHeader():
+        r = resp.response
+        raise ChromeProxyMetricException, (
+            'Response for %s should not have via header. '
+            'Reponse: status=(%d, %s)\nHeaders:\n %s' % (
+                r.url, r.status, r.status_text, r.headers))
+      else:
+        bypass_count += 1
+
     results.AddValue(scalar.ScalarValue(
-        results.current_page, 'direct_fallback', 'boolean', True))
+        results.current_page, 'bypass', 'count', bypass_count))

[bolian, 2014/12/09 22:06:14]

This result, 'bypass', does not match the func name xxxHTTPToDirectFallback.
Misplaced?

[sclittle, 2014/12/09 22:25:21]

Should it match it? This result is the number of bypassed responses in this
test; other tests do this with stats like "eligible_responses" and
"resources_via_proxy". Isn't this string the name of the result statistic, and
not the name of the test?

 
   def AddResultsForExplicitBypass(self, tab, results, expected_bad_proxies):
     """Verify results for an explicit bypass test.
 
     Args:
         tab: the tab for the test.
         results: the results object to add the results values to.
         expected_bad_proxies: A list of dictionary objects representing
             expected bad proxies and their expected retry time windows.
             See the definition of VerifyBadProxies for details.
     """
     info = GetProxyInfoFromNetworkInternals(tab)
     if not 'enabled' in info or not info['enabled']:
       raise ChromeProxyMetricException, (
           'Chrome proxy should be enabled. proxy info: %s' % info)
+    # TODO(sclittle): Remove this dependency on net-internals#proxy once an
+    # alternative method of verifying that Chrome is on the fallback proxy
+    # exists.
     self.VerifyBadProxies(info['badProxies'],
                           expected_bad_proxies)
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'explicit_bypass', 'boolean', True))