Bug 1501040 - Raptor fix so unsigned webext will load on mozilla-beta; r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D10453

--HG--
extra : moz-landing-system : lando

testing/mozharness/mozharness/mozilla/testing/raptor.py

@@ -502,6 +502,9 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
         # disable "GC poisoning" Bug# 1499043
         env['JSGC_DISABLE_POISONING'] = '1'
 
+        # needed to load unsigned raptor webext on moz-beta
+        env['MOZ_DISABLE_NONLOCAL_CONNECTIONS'] = '1'
+
         if self.repo_path is not None:
             env['MOZ_DEVELOPER_REPO_DIR'] = self.repo_path
         if self.obj_path is not None:

testing/raptor/raptor/raptor.py

@@ -222,6 +222,13 @@ class Raptor(object):
             self.control_server.app_name = self.config['binary']
 
         else:
+            # For Firefox we need to set MOZ_MOZ_DISABLE_NONLOCAL_CONNECTIONS=1 env var before
+            # startup. This is because of restrictions on moz-beta that require webext to be
+            # signed unless disable non-local connections
+            if self.config['app'] == "firefox":
+                self.log.info("setting MOZ_DISABLE_NONLOCAL_CONNECTIONS=1")
+                os.environ['MOZ_DISABLE_NONLOCAL_CONNECTIONS'] = "1"
+
             # now start the desktop browser
             self.log.info("starting %s" % self.config['app'])
 
@@ -240,6 +247,11 @@ class Raptor(object):
 
             self.control_server.browser_proc = proc
 
+            # pageload tests need to be able to access non-local connections via mitmproxy
+            if self.config['app'] == "firefox" and test.get('playback', None) is not None:
+                self.log.info("setting MOZ_DISABLE_NONLOCAL_CONNECTIONS=0")
+                os.environ['MOZ_DISABLE_NONLOCAL_CONNECTIONS'] = "0"
+
             # if geckoProfile is enabled, initialize it
             if self.config['gecko_profile'] is True:
                 self._init_gecko_profiling(test)