set console address for tests

Author: fiji-flo

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -441,6 +441,12 @@ def _get_runner_args(self):
         if env.get("MOZ_REMOTE_ALLOW_SYSTEM_ACCESS") is None:
             env.update({"MOZ_REMOTE_ALLOW_SYSTEM_ACCESS": "1"})
 
+        # Give enterprise builds a console address so generic builds never
+        # start unconfigured (or block on the console setup dialog) under
+        # Marionette. Set it to the empty string to exercise the unconfigured
+        # state.
+        env.setdefault("MOZ_ENTERPRISE_CONSOLE_ADDRESS", "http://127.0.0.1:1")
+
         args = {
             "binary": self.binary,
             "profile": self.profile,

testing/mozbase/mozrunner/mozrunner/utils.py

@@ -101,6 +101,13 @@ def test_environment(
     # override the user's choice here.  See bug 1049688.
     env.setdefault("MOZ_DISABLE_NONLOCAL_CONNECTIONS", "1")
 
+    # Give enterprise builds a console address so generic builds never start
+    # unconfigured (or block on the console setup dialog) under a test
+    # harness. A closed local port, because non-local connections are
+    # disabled above. Set it to the empty string to exercise the
+    # unconfigured state.
+    env.setdefault("MOZ_ENTERPRISE_CONSOLE_ADDRESS", "http://127.0.0.1:1")
+
     # Only enable verbose WebRTC logging in CI.
     if "MOZ_AUTOMATION" in os.environ:
         env.setdefault("MOZ_LOG", "signaling:3,mtransport:4,DataChannel:3,jsep:4")

toolkit/xre/nsAppRunner.cpp

@@ -6086,12 +6086,12 @@ int XREMain::XRE_mainStartup(bool* aExitFlag,
   // We now know there is no existing instance using the selected profile.
 
 #if defined(MOZ_ENTERPRISE)
-  // Never block automation on the interactive setup dialog: test harnesses
-  // launch the browser before any console address exists (Marionette's first
-  // launch precedes the test setUp that provides one via the AutoConfig file
-  // or MOZ_ENTERPRISE_CONSOLE_ADDRESS) and would time out waiting for it.
-  const bool enterpriseConsoleSetupAllowed =
-      !EnvHasValue("MOZ_AUTOMATION") && !CheckArgExists("marionette");
+  // Test harnesses provide a console address via
+  // MOZ_ENTERPRISE_CONSOLE_ADDRESS (mozrunner test_environment and
+  // Marionette's GeckoInstance), so setup should never be needed under
+  // automation. Keep a backstop for harnesses that miss it: the modal
+  // pre-profile dialog would otherwise hang the task until timeout.
+  const bool enterpriseConsoleSetupAllowed = !EnvHasValue("MOZ_AUTOMATION");
   if (gEnterpriseConsoleSetupNeeded && enterpriseConsoleSetupAllowed &&
       is_felt_ui()
 #  ifdef MOZ_BACKGROUNDTASKS