Merge pull request #619 from mozilla/ben/stabilize-addon-plus

Stabilize Various Tests, improve About:Logins methods

Author: soncuteanca

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:
@@ -228,6 +229,8 @@ def dedupe(run_list: list, slash: str) -> list:
         run_list.extend(ci_paths)
 
         # Dedupe just in case
+        if slash == "\\":
+            run_list = [entry.replace("/", slash) for entry in run_list]
         run_list = dedupe(run_list, slash)
         run_list = [entry for entry in run_list if os.path.exists(entry.split("::")[0])]
         with open(OUTPUT_FILE, "w") as fh:

dev_pyproject.toml

@@ -12,7 +12,8 @@ markers = [
     "ci: basic tests to run in ci",
     "locale_de: tests run in DE locale versions",
     "locale_fr: tests run in FR locale versions",
-    "locale_gb: tests run in GB locale versions"
+    "locale_gb: tests run in GB locale versions",
+    "noxvfb: tests that should not run in xvfb sessions"
 ]
 
 [tool.ruff]

modules/page_object_about_pages.py

@@ -152,11 +152,14 @@ def create_new_login(self, form_info: dict) -> Page:
         try:
             for item_type, value in form_info.items():
                 logging.info(f"Filling {item_type} with {value}")
-                self.ba.clear_and_fill(
-                    self.get_element("login-item-type", labels=[item_type]), value
-                )
+                self.fill("login-item-type", value, labels=[item_type])
             logging.info("Clicking submit...")
-            self.get_element("create-login-button")
+            self.wait.until(
+                lambda _: self.get_element("create-login-button").get_attribute(
+                    "disabled"
+                )
+                is None
+            )
             logging.info("Submitted.")
         except (WebDriverException, StaleElementReferenceException):
             logging.info("Element not found or stale, pressing 'Save Changes'")

modules/testrail_scripts/testrail_status_analyses.py

@@ -281,30 +281,30 @@ def print_numerical_summary(project_stats):
     report.info("NUMERICAL SUMMARY - TOTAL COUNTS")
     report.info(f"{'=' * 80}")
 
-    report.info(f"\n OVERALL TOTALS:")
+    report.info("\n OVERALL TOTALS:")
     report.info(f"   Total Suites: {project_stats['total_suites']}")
     report.info(f"   Total Test Cases: {project_stats['total_cases']}")
 
     if project_stats["total_cases"] == 0:
         return
 
-    report.info(f"\n SUB TEST SUITE TOTALS:")
+    report.info("\n SUB TEST SUITE TOTALS:")
     total_by_sub_suite = sorted(
         project_stats["by_sub_test_suite"].items(), key=lambda x: x[1], reverse=True
     )
     for sub_suite, count in total_by_sub_suite:
         percentage = (count / project_stats["total_cases"]) * 100
         report.info(f"   {sub_suite:30}: {count:6} cases ({percentage:5.1f}%)")
 
-    report.info(f"\n AUTOMATION STATUS TOTALS:")
+    report.info("\n AUTOMATION STATUS TOTALS:")
     total_by_status = sorted(
         project_stats["by_automation_status"].items(), key=lambda x: x[1], reverse=True
     )
     for status, count in total_by_status:
         percentage = (count / project_stats["total_cases"]) * 100
         report.info(f"   {status:20}: {count:6} cases ({percentage:5.1f}%)")
 
-    report.info(f"\n AUTOMATION COVERAGE TOTALS:")
+    report.info("\n AUTOMATION COVERAGE TOTALS:")
     total_by_coverage = sorted(
         project_stats["by_automation_coverage"].items(),
         key=lambda x: x[1],
@@ -434,7 +434,7 @@ def main():
         report.info(f"{'=' * 80}")
         report.info(f" Analyzed {project_stats['total_suites']} suites")
         report.info(f" Processed {project_stats['total_cases']} test cases")
-        report.info(f" Generated detailed statistics and breakdowns")
+        report.info(" Generated detailed statistics and breakdowns")
     else:
         op_log.error(" Analysis failed!")
 

pyproject.toml

@@ -12,7 +12,8 @@ markers = [
     "ci: basic tests to run in ci",
     "locale_de: tests run in DE locale versions",
     "locale_fr: tests run in FR locale versions",
-    "locale_gb: tests run in GB locale versions"
+    "locale_gb: tests run in GB locale versions",
+    "noxvfb: tests that should not run in xvfb sessions"
 ]
 
 [tool.ruff]

tests/bookmarks_and_history/test_open_bookmark_in_private_window_via_toolbar_context_menu.py

@@ -1,7 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object import ContextMenu, Navigation, PanelUi, TabBar
+from modules.browser_object import Navigation, TabBar
 from modules.page_object_generics import GenericPage
 
 

tests/password_manager/test_add_password_non_ascii_chars.py

@@ -22,6 +22,7 @@ def test_add_password_non_ascii_chars(driver: Firefox):
 
     # Open about:logins and click on the "Add password" button
     about_logins.open()
+    original_logins_amount = len(about_logins.get_elements("login-list-item"))
     about_logins.click_add_login_button()
 
     # Complete all the fields with valid data and click the "Save" button.
@@ -34,7 +35,12 @@ def test_add_password_non_ascii_chars(driver: Firefox):
     )
 
     # Check password added in the listbox
+    about_logins.wait.until(
+        lambda _: len(about_logins.get_elements("login-list-item"))
+        > original_logins_amount
+    )
     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_changes_made_in_edit_mode_are_saved.py

@@ -34,6 +34,7 @@ def test_changes_made_in_edit_mode_are_saved(driver: Firefox):
         }
     )
     # Click the "Edit" button
+    about_logins.element_visible("edit-login")
     about_logins.click_on("edit-login")
 
     # Change username and the password

tests/password_manager/test_multiple_saved_logins.py

@@ -55,7 +55,7 @@ def test_multiple_saved_logins(driver: Firefox, temp_selectors):
             "password": PASSWORD,
         }
     )
-    time.sleep(0.1)
+    time.sleep(0.8)
     about_logins.click_add_login_button()
     about_logins.create_new_login(
         {
@@ -64,7 +64,7 @@ def test_multiple_saved_logins(driver: Firefox, temp_selectors):
             "password": PASSWORD2,
         }
     )
-    time.sleep(0.1)
+    time.sleep(0.8)
     about_logins.click_add_login_button()
     about_logins.create_new_login(
         {

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