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):
-    count = 0
-    safebrowsing_count = 0
-
+  def AddResultsForSafebrowsingMobile(self, tab, results):
+    response_count = 0
     for resp in self.IterResponses(tab):
-      count += 1
-      if resp.IsSafebrowsingResponse():
-        safebrowsing_count += 1
-      else:
+      response_count += 1
+      if not resp.IsSafebrowsingResponse():
         r = resp.response
         raise ChromeProxyMetricException, (
             '%s: Not a valid safe browsing response.\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))
-    else:
+
+    if response_count == 0:
       raise ChromeProxyMetricException, (
-          'Safebrowsing failed (count=%d, safebrowsing_count=%d)\n' % (
-              count, safebrowsing_count))
+          'Safebrowsing failed: No valid responses received)\n')

[sclittle, 2015/01/23 20:06:46]

nit: remove ')\n' from the end

[Not at Google. Contact bengr, 2015/01/23 22:56:00]

Done.

+
+    results.AddValue(scalar.ScalarValue(
+        results.current_page, 'safebrowsing', 'responses', response_count))
+
+
+  def AddResultsForSafebrowsingDesktop(self, tab, results):
+    response_count = 0
+    for resp in self.IterResponses(tab):
+      # For desktop, data reduction proxy should return the real response for
+      # sites with malware.
+      response_count += 1
+      if not resp.HasChromeProxyViaHeader():
+        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 response_count == 0:
+      raise ChromeProxyMetricException, (
+          'Safebrowsing failed: No valid responses received\n')

[sclittle, 2015/01/23 20:06:46]

nit: remove '\n' from the end

[Not at Google. Contact bengr, 2015/01/23 22:56:00]

Done.

+
+    results.AddValue(scalar.ScalarValue(
+        results.current_page, 'safebrowsing', 'responses', response_count))
 
   def AddResultsForHTTPFallback(self, tab, results):
     via_fallback_count = 0
 
     for resp in self.IterResponses(tab):
       if resp.ShouldHaveChromeProxyViaHeader():
         # All responses should have come through the HTTP fallback proxy, which
         # means that they should have the via header, and if a remote port is
         # defined, it should be port 80.
         if (not resp.HasChromeProxyViaHeader() or
@@ skipping 108 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))