Integration tests for desktop platforms and safebrowsing

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 logging
 import time
 
 from integration_tests import network_metrics
 from telemetry.page import page_test
 from telemetry.value import scalar
@@ skipping 252 matching lines @@
           'Exactly one response should be bypassed. '
           '(eligible_response_count=%d, bypass_count=%d)\n' % (
               eligible_response_count, bypass_count))
     else:
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'eligible_responses', 'count',
           eligible_response_count))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'bypass', 'count', bypass_count))
 
-  def AddResultsForSafebrowsing(self, tab, results):
+  def AddResultsForSafebrowsingMobile(self, tab, results):
     count = 0
     safebrowsing_count = 0
 
     for resp in self.IterResponses(tab):
       count += 1
       if resp.IsSafebrowsingResponse():
         safebrowsing_count += 1
       else:
         r = resp.response
         raise ChromeProxyMetricException, (
@@ skipping 19 matching lines @@
         if (not resp.HasChromeProxyViaHeader() or
             (resp.remote_port and resp.remote_port != 80)):
           r = resp.response
           raise ChromeProxyMetricException, (
               '%s: Should have come through the fallback proxy.\n'
               'Reponse: remote_port=%s status=(%d, %s)\nHeaders:\n %s' % (
                   r.url, str(resp.remote_port), r.status, r.status_text,
                   r.headers))
         via_fallback_count += 1
 
-    results.AddValue(scalar.ScalarValue(
-        results.current_page, 'via_fallback', 'count', via_fallback_count))
+  def AddResultsForSafebrowsingDesktop(self, tab, results):

[sclittle, 2015/01/22 23:15:14]

Move this method definition up above AddResultsForHTTPFallback.

[Not at Google. Contact bengr, 2015/01/23 17:11:34]

Done.

+    count = 0
+    safebrowsing_count = 0
+    for resp in self.IterResponses(tab):

[sclittle, 2015/01/22 23:15:14]

What do you actually expect to happen here? Should the DRP return a safebrowsing
response, and the client should ignore it, or should the real response come in
from the DRP, or should the DRP cause a bypass? Or should the client not send
any request at all and pop up an interstitial?

Please comment about what is expected to happen on desktop.

[Not at Google. Contact bengr, 2015/01/23 17:11:34]

Done.

+      count += 1
+      if resp.HasChromeProxyViaHeader():
+        safebrowsing_count += 1

[sclittle, 2015/01/22 23:15:14]

Why is this called safebrowsing_count if you're counting via headers?

[Not at Google. Contact bengr, 2015/01/23 17:11:34]

Changed to viaheader_count. Had originally kept it safebrowsing_count because
via header is the expected response for a site with malware in it for desktop.
Don't have a strong preference either way.

+      else:
+        r = resp.response
+        raise ChromeProxyMetricException, (
+            '%s: Safebrowsing feature should be off for desktop.\n'
+            'Reponse: status=(%d, %s)\nHeaders:\n %s' % (
+                r.url, r.status, r.status_text, r.headers))
+    if count == safebrowsing_count:
+      results.AddValue(scalar.ScalarValue(
+          results.current_page, 'safebrowsing', 'boolean', True))

[sclittle, 2015/01/22 23:15:14]

Instead of just a boolean, how about adding both count and safebrowsing_count as
results? You could update the regular safebrowsing test to report these as well.

[Not at Google. Contact bengr, 2015/01/23 17:11:34]

Done. Added count. safebrowsing_count is redundant since this only gets printed
when they are equal.

+    else:
+      raise ChromeProxyMetricException, (
+          'Safebrowsing failed (count=%d, safebrowsing_count=%d)\n' % (
+              count, safebrowsing_count))
 
   def AddResultsForHTTPToDirectFallback(self, tab, results):
     via_fallback_count = 0
     bypass_count = 0
     responses = self.IterResponses(tab)
 
     # The very first response should be through the HTTP fallback proxy.
     fallback_resp = next(responses, None)
     if not fallback_resp:
       raise ChromeProxyMetricException, 'There should be at least one response.'
@@ skipping 87 matching lines @@
             'Response for %s should have via header; proxy should no longer '
             'be bypassed.\nReponse: status=(%d, %s)\nHeaders:\n %s' % (
                 r.url, r.status, r.status_text, r.headers))
       else:
         via_count += 1
 
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'bypass', 'count', bypass_count))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'via', 'count', via_count))