tor-browser

commit 5ce93cedada8080679350502d35f75ee946aa44d
parent f425f91079b9f563a4421ed0668a5a9e9fa859db
Author: Simon Friedberger <simon@mozilla.com>
Date:   Fri,  3 Oct 2025 07:45:35 +0000

Bug 1990777: Drive-by fix: set pref in tests to ensure scoped resetting r=mtigley,credential-management-reviewers,tgiles

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

Diffstat:
M
browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js
 | 
3
+++
M
browser/components/aboutlogins/tests/browser/browser_copyToClipboardButton.js
 | 
5
++++-
M
browser/components/aboutlogins/tests/browser/browser_createLogin.js
 | 
3
+++
M
browser/components/aboutlogins/tests/browser/browser_deleteLogin.js
 | 
3
+++
M
browser/components/aboutlogins/tests/browser/browser_openExport.js
 | 
4
++++
M
browser/components/aboutlogins/tests/browser/browser_openSite.js
 | 
3
+++
M
browser/components/aboutlogins/tests/browser/browser_osAuthDialog.js
 | 
5
++++-
M
browser/components/aboutlogins/tests/browser/browser_updateLogin.js
 | 
3
+++
M
browser/components/preferences/tests/browser_password_management.js
 | 
6
++++++
M
browser/components/preferences/tests/browser_primaryPassword.js
 | 
6
++++++
M
toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_delete_login.js
 | 
1
+
M
toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_export_success_notification.js
 | 
6
++++++
M
toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_filter.js
 | 
1
+
M
toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_list_alerts.js
 | 
1
+
M
toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_multiple_windows.js
 | 
1
+
M
toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_sidebar.js
 | 
6
++++++

16 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js b/browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js
@@ -32,6 +32,9 @@ add_setup(async function () {
     gBrowser,
     url: "about:logins",
   });
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
     Services.logins.removeAllUserFacingLogins();
diff --git a/browser/components/aboutlogins/tests/browser/browser_copyToClipboardButton.js b/browser/components/aboutlogins/tests/browser/browser_copyToClipboardButton.js
@@ -3,7 +3,10 @@
 
 add_task(async function test() {
   await SpecialPowers.pushPrefEnv({
-    set: [["dom.events.testing.asyncClipboard", true]],
+    set: [
+      ["dom.events.testing.asyncClipboard", true],
+      ["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""],
+    ],
   });
 
   await BrowserTestUtils.withNewTab(
diff --git a/browser/components/aboutlogins/tests/browser/browser_createLogin.js b/browser/components/aboutlogins/tests/browser/browser_createLogin.js
@@ -6,6 +6,9 @@ add_setup(async function () {
     gBrowser,
     url: "about:logins",
   });
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(aboutLoginsTab);
     Services.logins.removeAllUserFacingLogins();
diff --git a/browser/components/aboutlogins/tests/browser/browser_deleteLogin.js b/browser/components/aboutlogins/tests/browser/browser_deleteLogin.js
@@ -8,6 +8,9 @@ add_setup(async function () {
     gBrowser,
     url: "about:logins",
   });
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   });
diff --git a/browser/components/aboutlogins/tests/browser/browser_openExport.js b/browser/components/aboutlogins/tests/browser/browser_openExport.js
@@ -36,6 +36,10 @@ add_setup(async function () {
   MockFilePicker.useAnyFile();
   MockFilePicker.returnValue = MockFilePicker.returnOK;
 
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
+
   registerCleanupFunction(() => {
     MockFilePicker.cleanup();
     LoginTestUtils.clearData();
diff --git a/browser/components/aboutlogins/tests/browser/browser_openSite.js b/browser/components/aboutlogins/tests/browser/browser_openSite.js
@@ -7,6 +7,9 @@ add_setup(async function () {
     gBrowser,
     url: "about:logins",
   });
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
     Services.logins.removeAllUserFacingLogins();
diff --git a/browser/components/aboutlogins/tests/browser/browser_osAuthDialog.js b/browser/components/aboutlogins/tests/browser/browser_osAuthDialog.js
@@ -14,7 +14,10 @@ const SELECTORS = {
 
 add_setup(async function () {
   await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
+    set: [
+      ["test.wait300msAfterTabSwitch", true],
+      ["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""],
+    ],
   });
 
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
diff --git a/browser/components/aboutlogins/tests/browser/browser_updateLogin.js b/browser/components/aboutlogins/tests/browser/browser_updateLogin.js
@@ -11,6 +11,9 @@ add_setup(async function () {
     gBrowser,
     url: "about:logins",
   });
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
     Services.logins.removeAllUserFacingLogins();
diff --git a/browser/components/preferences/tests/browser_password_management.js b/browser/components/preferences/tests/browser_password_management.js
@@ -7,6 +7,12 @@ const { TelemetryTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
+});
+
 var passwordsDialog;
 
 add_task(async function test_openPasswordManagement() {
diff --git a/browser/components/preferences/tests/browser_primaryPassword.js b/browser/components/preferences/tests/browser_primaryPassword.js
@@ -5,6 +5,12 @@ const { OSKeyStore } = ChromeUtils.importESModule(
   "resource://gre/modules/OSKeyStore.sys.mjs"
 );
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
+});
+
 add_task(async function () {
   let prefs = await openPreferencesViaOpenPreferencesAPI("panePrivacy", {
     leaveOpen: true,
diff --git a/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_delete_login.js b/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_delete_login.js
@@ -8,6 +8,7 @@ add_setup(async function () {
     set: [
       ["browser.contextual-password-manager.enabled", true],
       ["signon.rememberSignons", true],
+      ["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""],
     ],
   });
   LoginTestUtils.clearData();
diff --git a/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_export_success_notification.js b/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_export_success_notification.js
@@ -3,6 +3,12 @@
 
 "use strict";
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
+});
+
 const { MockFilePicker } = SpecialPowers;
 const tempDir = createTemporarySaveDirectory();
 MockFilePicker.displayDirectory = tempDir;
diff --git a/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_filter.js b/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_filter.js
@@ -8,6 +8,7 @@ add_setup(async function () {
     set: [
       ["browser.contextual-password-manager.enabled", true],
       ["signon.rememberSignons", true],
+      ["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""],
     ],
   });
   registerCleanupFunction(LoginTestUtils.clearData);
diff --git a/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_list_alerts.js b/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_list_alerts.js
@@ -8,6 +8,7 @@ add_setup(async function () {
     set: [
       ["browser.contextual-password-manager.enabled", true],
       ["signon.rememberSignons", true],
+      ["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""],
     ],
   });
   registerCleanupFunction(() => {
diff --git a/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_multiple_windows.js b/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_multiple_windows.js
@@ -8,6 +8,7 @@ add_setup(async function () {
     set: [
       ["browser.contextual-password-manager.enabled", true],
       ["signon.rememberSignons", true],
+      ["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""],
     ],
   });
   registerCleanupFunction(() => {
diff --git a/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_sidebar.js b/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_sidebar.js
@@ -7,6 +7,12 @@ const { SUPPORT_URL, PREFERENCES_URL } = ChromeUtils.importESModule(
   "resource://gre/modules/megalist/aggregator/datasources/LoginDataSource.sys.mjs"
 );
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["toolkit.osKeyStore.unofficialBuildOnlyLogin", ""]],
+  });
+});
+
 const EXPECTED_PASSWORD_CARD_VALUES = [
   {
     originLine: { value: "example1.com" },