Remove proxy retry time condition from CORS bypass integration test.

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.page import page_test
@@ skipping 236 matching lines @@
       got_retry_time = datetime.datetime.fromtimestamp(
           int(bad_proxy['retry'])/1000)
       if not ProxyRetryTimeInRange(
           got_retry_time, retry_time_low, retry_time_high):
         raise ChromeProxyMetricException, (
             'Bad proxy %s retry time (%s) should be within range (%s-%s).' % (
                 bad_proxy['proxy'], str(got_retry_time), str(retry_time_low),
                 str(retry_time_high)))
 
   def VerifyAllProxiesBypassed(self, tab):
+    """Verify that all proxies are bypassed for 1 to 5 minutes."""
     if tab:
       info = GetProxyInfoFromNetworkInternals(tab)
       if not info['enabled']:
         raise ChromeProxyMetricException, (
             'Chrome proxy should be enabled. proxy info: %s' % info)
       is_bypassed, expected_bad_proxies = self.IsProxyBypassed(tab)
       if not is_bypassed:
         raise ChromeProxyMetricException, (
             'Chrome proxy should be bypassed. proxy info: %s' % info)
       self.VerifyBadProxies(info['badProxies'],
@@ skipping 66 matching lines @@
               '%s: Got a 502 without a subsequent 200' % (url))
       elif bypasses[url] > 1:
         raise ChromeProxyMetricException, (
               '%s: Got a 502 and multiple 200s: %d' % (url, bypasses[url]))
     if bypass_count == 0:
       raise ChromeProxyMetricException, (
           'At least one response should be bypassed. '
           '(eligible_response_count=%d, bypass_count=%d)\n' % (
               eligible_response_count, bypass_count))
 
-    self.VerifyAllProxiesBypassed(tab)
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'cors_bypass', 'count', bypass_count))
 
   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():
@@ skipping 43 matching lines @@
       raise ChromeProxyMetricException, (
           'Safebrowsing failed (count=%d, safebrowsing_count=%d)\n' % (
               count, safebrowsing_count))
 
   def VerifyProxyInfo(self, tab, expected_proxies, expected_bad_proxies):
     info = GetProxyInfoFromNetworkInternals(tab)
     if not 'enabled' in info or not info['enabled']:
       raise ChromeProxyMetricException, (
           'Chrome proxy should be enabled. proxy info: %s' % info)
     proxies = info['proxies']
-    if (proxies != expected_proxies and
-        proxies != self.ProxyListForDev(expected_proxies)):
+    if (set(proxies) != set(expected_proxies) and
+        set(proxies) != set(self.ProxyListForDev(expected_proxies))):
       raise ChromeProxyMetricException, (
           'Wrong effective proxies (%s). Expect: "%s"' % (
           str(proxies), str(expected_proxies)))
 
     bad_proxies = []
     if 'badProxies' in info and info['badProxies']:
       bad_proxies = [p['proxy'] for p in info['badProxies']
                      if 'proxy' in p and p['proxy']]
-    if (bad_proxies != expected_bad_proxies and
-        bad_proxies != self.ProxyListForDev(expected_bad_proxies)):
+    if (set(bad_proxies) != set(expected_bad_proxies) and
+        set(bad_proxies) != set(self.ProxyListForDev(expected_bad_proxies))):
       raise ChromeProxyMetricException, (
           'Wrong bad proxies (%s). Expect: "%s"' % (
           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:
@@ skipping 19 matching lines @@
             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)
     self.VerifyBadProxies(info['badProxies'],
                           expected_bad_proxies)
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'explicit_bypass', 'boolean', True))