Bug 1619498 - Fix passwordmgr mochitest-plain test-verify failures. r=sfoster

Also add some logging that seems generally useful.

Depends on D67087

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

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

toolkit/components/passwordmgr/LoginManagerChild.jsm

@@ -1202,11 +1202,13 @@ this.LoginManagerChild = class LoginManagerChild extends JSWindowActorChild {
       form
     );
     if (fieldOverrideRecipe) {
+      log("Has fieldOverrideRecipe", fieldOverrideRecipe);
       let pwOverrideField = LoginRecipesContent.queryLoginField(
         form,
         fieldOverrideRecipe.passwordSelector
       );
       if (pwOverrideField) {
+        log("Has pwOverrideField", pwOverrideField);
         // The field from the password override may be in a different LoginForm.
         let formLike = LoginFormFactory.createFromField(pwOverrideField);
         pwFields = [

toolkit/components/passwordmgr/LoginRecipes.jsm

@@ -219,6 +219,7 @@ this.LoginRecipesContent = {
   _recipeCache: new WeakMap(),
 
   _clearRecipeCache() {
+    log.debug("_clearRecipeCache");
     this._recipeCache = new WeakMap();
   },
 
@@ -309,7 +310,7 @@ this.LoginRecipesContent = {
    */
   getFieldOverrides(aRecipes, aForm) {
     let recipes = this._filterRecipesForForm(aRecipes, aForm);
-    log.debug("getFieldOverrides: filtered recipes:", recipes);
+    log.debug("getFieldOverrides: filtered recipes:", recipes.size, recipes);
     if (!recipes.size) {
       return null;
     }

toolkit/components/passwordmgr/test/mochitest/mochitest.ini

@@ -43,7 +43,7 @@ scheme = https
 skip-if = toolkit == 'android' # autocomplete
 [test_autocomplete_password_open.html]
 scheme = https
-skip-if = toolkit == 'android' # autocomplete
+skip-if = toolkit == 'android' || verify # autocomplete
 [test_autocomplete_sandboxed.html]
 scheme = https
 skip-if = toolkit == 'android' # autocomplete
@@ -128,7 +128,7 @@ scheme = https
 skip-if = toolkit == 'android' # password generation
 [test_master_password.html]
 scheme = https
-skip-if = os != 'mac' # Tests desktop prompts and bug 1333264
+skip-if = os != 'mac' || verify # Tests desktop prompts and bug 1333264
 support-files =
   chrome_timeout.js
   subtst_master_pass.html

toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js

@@ -543,7 +543,7 @@ const PWMGR_COMMON_PARENT = runInParent(
 );
 
 SimpleTest.registerCleanupFunction(() => {
-  SpecialPowers.popPrefEnv();
+  SpecialPowers.flushPrefEnv();
 
   PWMGR_COMMON_PARENT.sendAsyncMessage("cleanup");
 

toolkit/components/passwordmgr/test/mochitest/test_insecure_form_field_no_saved_login.html

@@ -31,15 +31,17 @@ let chromeScript = runChecksAfterCommonInit();
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-/** Test for Login Manager: contextual inscure password warning without saved logins. **/
+/** Test for Login Manager: contextual insecure password warning without saved logins. **/
 
 // Set to pref before the document loads.
+let originalInsecureEnabled = SpecialPowers.getBoolPref(
+  "security.insecure_field_warning.contextual.enabled");
 SpecialPowers.setBoolPref(
   "security.insecure_field_warning.contextual.enabled", true);
 
 SimpleTest.registerCleanupFunction(() => {
-  SpecialPowers.clearUserPref(
-    "security.insecure_field_warning.contextual.enabled");
+  SpecialPowers.setBoolPref(
+    "security.insecure_field_warning.contextual.enabled", originalInsecureEnabled);
 });
 
 let uname = $_(1, "uname");

toolkit/components/passwordmgr/test/mochitest/test_prompt_async.html

@@ -23,8 +23,6 @@
       // These are magically defined on the window due to the iframe IDs
       /* global iframe1, iframe2a, iframe2b */
 
-      let chromeScript = runInParent(SimpleTest.getTestFileURL("pwmgr_common.js"));
-
       /**
        * Add a listener to add some logins to be autofilled in the HTTP/proxy auth. prompts later.
        */