Bug 1658359 - Point Glean-sent pings to localhost for tests that redirect Telemetry r=janerik

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

testing/profiles/perf/user.js

@@ -82,6 +82,7 @@ user_pref("privacy.trackingprotection.pbmode.enabled", false);
 user_pref("security.enable_java", false);
 user_pref("security.fileuri.strict_origin_policy", false);
 user_pref("toolkit.telemetry.server", "https://127.0.0.1/telemetry-dummy/");
+user_pref("telemetry.fog.test.localhost_port", 1337);
 user_pref("startup.homepage_welcome_url", "");
 user_pref("startup.homepage_welcome_url.additional", "");
 user_pref("trailhead.firstrun.branches", "join");

testing/profiles/raptor-android/user.js

@@ -9,3 +9,4 @@ user_pref("browser.cache.disk.smart_size.enabled", true);
 user_pref("extensions.webextensions.warnings-as-errors", false);
 // disable telemetry bug 1639148
 user_pref("toolkit.telemetry.server", "");
+user_pref("telemetry.fog.test.localhost_port", 1337);

testing/profiles/reftest/user.js

@@ -93,6 +93,7 @@ user_pref("testing.supports.moz-bool-pref", false);
 // server in the middle of the tests.
 user_pref("toolkit.telemetry.enabled", false);
 user_pref("toolkit.telemetry.server", "https://%(server)s/telemetry-dummy/");
+user_pref("telemetry.fog.test.localhost_port", 1337);
 user_pref("ui.caretBlinkTime", -1);
 user_pref("ui.caretWidth", 1);
 user_pref("ui.prefersReducedMotion", 0);

testing/profiles/unittest-required/user.js

@@ -216,6 +216,7 @@ user_pref("toolkit.telemetry.firstShutdownPing.enabled", false);
 user_pref("toolkit.telemetry.newProfilePing.enabled", false);
 // We want to collect telemetry, but we don't want to send in the results.
 user_pref("toolkit.telemetry.server", "https://{server}/telemetry-dummy/");
+user_pref("telemetry.fog.test.localhost_port", 1337);
 // Don't send the 'shutdown' ping using the pingsender on the first session using
 // the 'pingsender' process. Valgrind marks the process as leaky (e.g. see bug 1364068
 // for the 'new-profile' ping) but does not provide enough information

testing/profiles/xpcshell/user.js

@@ -14,6 +14,7 @@ user_pref("geo.provider.network.compare.url", "");
 user_pref("media.gmp-manager.updateEnabled", false);
 user_pref("media.gmp-manager.url.override", "http://%(server)s/dummy-gmp-manager.xml");
 user_pref("toolkit.telemetry.server", "https://%(server)s/telemetry-dummy");
+user_pref("telemetry.fog.test.localhost_port", 1337);
 // Prevent Remote Settings to issue non local connections.
 user_pref("services.settings.server", "http://localhost/remote-settings-dummy/v1");
 // Prevent intermediate preloads to be downloaded on Remote Settings polling.

toolkit/components/telemetry/tests/integration/tests/conftest.py

@@ -67,6 +67,7 @@ def fixture_marionette(binary, ping_server):
         # Disable smart sizing because it changes prefs at startup. (bug 1547750)
         "browser.cache.disk.smart_size.enabled": False,
         "toolkit.telemetry.server": server_url,
+        "telemetry.fog.test.localhost_port": 1337,
         "toolkit.telemetry.initDelay": 1,
         "toolkit.telemetry.minSubsessionLength": 0,
         "datareporting.healthreport.uploadEnabled": True,

toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/runner.py

@@ -32,6 +32,7 @@ class TelemetryTestRunner(BaseMarionetteTestRunner):
                 # Disable smart sizing because it changes prefs at startup. (bug 1547750)
                 "browser.cache.disk.smart_size.enabled": False,
                 "toolkit.telemetry.server": "{}/pings".format(SERVER_URL),
+                "telemetry.fog.test.localhost_port": 1337,
                 "toolkit.telemetry.initDelay": 1,
                 "toolkit.telemetry.minSubsessionLength": 0,
                 "datareporting.healthreport.uploadEnabled": True,

toolkit/crashreporter/test/unit/test_crashreporter_crash.js

@@ -112,6 +112,7 @@ add_task(async function run_test() {
         "toolkit.telemetry.server",
         "http://a.telemetry.server"
       );
+      Services.prefs.setIntPref("telemetry.fog.test.localhost_port", 1337);
       Services.prefs.setCharPref(
         "toolkit.telemetry.cachedClientID",
         "f3582dee-22b9-4d73-96d1-79ef5bf2fc24"