Bug 1509009 - Fix proxy policy for raptor http pageload; r=davehunt
authorRob Wood <rwood@mozilla.com>
Thu, 22 Nov 2018 20:38:17 +0000
changeset 504185 d997f8cd27fc9e7a8fb31ad648d2d29d3c3525f3
parent 504184 d8cec61d53e80441e8b44eb02c0c914595d4c8ab
child 504186 fc10fcd1506648228b059419d4df5c3e895155c6
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdavehunt
bugs1509009
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1509009 - Fix proxy policy for raptor http pageload; r=davehunt Differential Revision: https://phabricator.services.mozilla.com/D12698
testing/raptor/raptor/playback/mitmproxy.py
testing/talos/talos/mitmproxy/mitmproxy.py
--- a/testing/raptor/raptor/playback/mitmproxy.py
+++ b/testing/raptor/raptor/playback/mitmproxy.py
@@ -63,25 +63,27 @@ POLICIES_CONTENT_ON = '''{
   "policies": {
     "Certificates": {
       "Install": ["%(cert)s"]
     },
     "Proxy": {
       "Mode": "manual",
       "HTTPProxy": "%(host)s:8080",
       "SSLProxy": "%(host)s:8080",
-      "Passthrough": "localhost, 127.0.0.1, %(host)s"
+      "Passthrough": "localhost, 127.0.0.1, %(host)s",
+      "Locked": true
     }
   }
 }'''
 
 POLICIES_CONTENT_OFF = '''{
   "policies": {
     "Proxy": {
-      "Mode": "none"
+      "Mode": "none",
+      "Locked": false
     }
   }
 }'''
 
 
 class Mitmproxy(Playback, Python3Virtualenv, TestingMixin, MercurialScript):
 
     def __init__(self, config):
--- a/testing/talos/talos/mitmproxy/mitmproxy.py
+++ b/testing/talos/talos/mitmproxy/mitmproxy.py
@@ -30,25 +30,27 @@ POLICIES_CONTENT_ON = '''{
   "policies": {
     "Certificates": {
       "Install": ["%(cert)s"]
     },
     "Proxy": {
       "Mode": "manual",
       "HTTPProxy": "127.0.0.1:8080",
       "SSLProxy": "127.0.0.1:8080",
-      "Passthrough": "localhost, 127.0.0.1"
+      "Passthrough": "localhost, 127.0.0.1",
+      "Locked": true
     }
   }
 }'''
 
 POLICIES_CONTENT_OFF = '''{
   "policies": {
     "Proxy": {
-      "Mode": "none"
+      "Mode": "none",
+      "Locked": false
     }
   }
 }'''
 
 
 def install_mitmproxy_cert(mitmproxy_proc, browser_path):
     """Install the CA certificate generated by mitmproxy, into Firefox
     1. Create a directory called distribution in the same directory as the Firefox executable