moved other tests to unified.json and reworked runner script

Author: philimon-reset

l10n_CM/Unified/conftest.py

@@ -1,4 +1,5 @@
 import os
+from typing import List
 
 import pytest
 
@@ -15,18 +16,18 @@ def region():
 
 @pytest.fixture()
 def add_prefs(region: str):
-    return [
+    return []
+
+
+@pytest.fixture()
+def set_prefs(add_prefs: List[tuple[str, str | bool]], region: str):
+    """Set prefs"""
+    prefs = [
         ("extensions.formautofill.creditCards.reauth.optout", False),
         ("extensions.formautofill.reauth.enabled", False),
         ("browser.aboutConfig.showWarning", False),
         ("browser.search.region", region),
     ]
-
-
-@pytest.fixture()
-def set_prefs(add_prefs: dict, region: str):
-    """Set prefs"""
-    prefs = []
     prefs.extend(add_prefs)
     return prefs
 

l10n_CM/region/CA.json

@@ -1,13 +1,5 @@
 {
     "region": "CA",
     "tests": [
-        "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
-        "test_demo_cc_add_new_credit_card.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
-        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_dropdown-presence.py",
-        "test_demo_cc_clear_form.py"
     ]
 }

l10n_CM/region/DE.json

@@ -1,13 +1,5 @@
 {
     "region": "DE",
     "tests": [
-        "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
-        "test_demo_cc_add_new_credit_card.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
-        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_dropdown-presence.py",
-        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_clear_form.py"
     ]
 }

l10n_CM/region/FR.json

@@ -1,13 +1,5 @@
 {
     "region": "FR",
     "tests": [
-        "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
-        "test_demo_cc_add_new_credit_card.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
-        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_dropdown-presence.py",
-        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_dropdown-presence.py",
-        "test_demo_cc_clear_form.py"
     ]
 }

l10n_CM/region/US.json

@@ -1,12 +1,4 @@
 {
-    "region": "US",
-    "tests": [
-        "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
-        "test_demo_cc_add_new_credit_card.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
-        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_dropdown-presence.py",
-        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
-        "test_us_demo_addy_verify_new_address_added.py"
-    ]
-}
+  "region": "US",
+  "tests": []
+}

l10n_CM/region/Unified.json

@@ -0,0 +1,13 @@
+{
+  "tests": [
+    "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+    "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+    "test_demo_cc_add_new_credit_card.py",
+    "test_demo_cc_clear_form.py",
+    "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
+    "test_demo_cc_dropdown-presence.py",
+    "test_us_demo_addy_verify_new_address_added.py"
+  ]
+}

l10n_CM/run_l10n.py

@@ -21,14 +21,21 @@ def get_region_tests(test_region: str) -> list[str]:
 
 if __name__ == "__main__":
     valid_region = {"US", "CA", "DE", "FR"}
-    regions = sys.argv[1:] if len(sys.argv[1:]) > 0 else valid_region
+    if len(sys.argv[1:]) == 0:
+        regions = ["Unified"] + list(valid_region)
+    else:
+        regions = sys.argv[1:]
     for region in regions:
-        if region not in valid_region:
+        if region not in valid_region and region != "Unified":
             raise ValueError("Invalid Region.")
         tests = get_region_tests(region)
         try:
-            os.environ["STARFOX_REGION"] = region
-            subprocess.run(["pytest", *tests], check=True, text=True)
+            if len(tests) > 0:
+                if region != "Unified":
+                    os.environ["STARFOX_REGION"] = region
+                subprocess.run(["pytest", *tests], check=True, text=True)
+            else:
+                logging.info(f"{region} has no tests.")
+                print(f"{region} has no tests.")
         except subprocess.CalledProcessError as e:
-            print(e)
             logging.warn(f"Test run failed. {e}")