update chooser; force more runs

Author: ben-c-at-moz

choose_ci_set.py

@@ -93,9 +93,10 @@ def dedupe(run_list: list, slash: str) -> list:
         for j, entry_b in enumerate(run_list):
             if i == j:
                 continue
-            candidate = max((i, j))
-            if entry_a in entry_b and candidate not in removes:
-                removes.append(candidate)
+            candidate = max((entry_a, entry_b))
+            cand_index = run_list.index(candidate)
+            if entry_a in entry_b and cand_index not in removes:
+                removes.append(cand_index)
 
     removes.sort(reverse=True)
     for remove in removes:

tests/password_manager/test_add_password_non_ascii_chars.py

@@ -34,6 +34,7 @@ def test_add_password_non_ascii_chars(driver: Firefox):
     )
 
     # Check password added in the listbox
+    about_logins.element_visible("login-list-item")
     logins = about_logins.get_elements("login-list-item")
     mozilla_login = next(
         login for login in logins if login.get_attribute("title") == WEBSITE_ADDRESS

tests/password_manager/test_primary_password_triggered_on_about_logins_access.py

@@ -66,6 +66,7 @@ def test_primary_password_triggered_on_about_logins_access_via_hamburger_menu(
     )
 
     # Attempt to view the saved password in order to trigger the primary password prompt
+    about_logins.element_visible("show-password-checkbox")
     about_logins.click_on("show-password-checkbox")
 
     # Dismiss the primary password prompt without entering the password

tests/preferences/test_clear_cookie_data.py

@@ -4,6 +4,8 @@
 from modules.page_object import AboutPrefs
 from modules.util import BrowserActions
 
+"""Force rerun"""
+
 
 @pytest.fixture()
 def test_case():

tests/security_and_privacy/test_blocking_fingerprinters.py

@@ -4,6 +4,8 @@
 from modules.browser_object_navigation import Navigation
 from modules.page_object_prefs import AboutPrefs
 
+"""Force rerun"""
+
 
 @pytest.fixture()
 def test_case():