disable google CAPTCHAd tests

choose_ci_set.py

@@ -1,7 +1,7 @@
 import os
 import re
 import sys
-from subprocess import CalledProcessError, check_output
+from subprocess import check_output
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 CI_MARK = "@pytest.mark.ci"
@@ -114,12 +114,9 @@ def get_tests_by_model(
                     test_paths_and_contents[this_file] = "".join(lines)
 
     ci_paths = []
-    ci_headed_paths = []
     for path, content in test_paths_and_contents.items():
         if CI_MARK in content:
             ci_paths.append(localify(path))
-            if HEADED_MARK in content:
-                ci_headed_paths.append(localify(path))
 
     # Dedupe just in case
     ci_paths = list(set(ci_paths))
@@ -172,8 +169,8 @@ def get_tests_by_model(
     if not run_list:
         print("\n".join(ci_paths))
     else:
-        run_list = list(set(run_list))
-        # Dedupe just in case
+        run_list.extend(ci_paths)
 
-        run_list.extend(ci_headed_paths)
+        # Dedupe just in case
+        run_list = list(set(run_list))
         print("\n".join(run_list))

tests/address_bar_and_search/test_glean_basic.py

@@ -57,6 +57,7 @@ def glean_handler(rq: Request) -> Response:
     return Response("", status=200)
 
 
+@pytest.mark.unstable
 def test_glean_ping(driver: Firefox, httpserver: HTTPServer):
     """C2234689: Test that Glean pings contain expected info"""
     global PINGS_WITH_ID

tests/address_bar_and_search/test_google_withads_url_bar_us.py

@@ -23,6 +23,7 @@ def add_prefs():
 MAC_GHA = environ.get("GITHUB_ACTIONS") == "true" and sys.platform.startswith("darwin")
 
 
+@pytest.mark.unstable
 @pytest.mark.skipif(MAC_GHA, reason="Test unstable in MacOS Github Actions")
 def test_google_withads_url_bar_us(driver: Firefox):
     """

tests/address_bar_and_search/test_sap_google_adclick.py

@@ -14,6 +14,7 @@ def test_case():
     return "1365108"
 
 
+@pytest.mark.unstable
 def test_sap_google_adclick(driver: Firefox):
     """
     C1365108, Test SAP Google adclick - URL bar - US

tests/address_bar_and_search/test_search_code_google_non_us.py

@@ -23,6 +23,7 @@ def overwrite_prefs():
 FX_SEARCH_CODE = "client=firefox-b-d"
 
 
+@pytest.mark.unstable
 def test_search_code_google_non_us(driver: Firefox):
     """
     C1365269 - Default Search Code: Google - non-US

tests/address_bar_and_search/test_search_code_google_us.py

@@ -15,6 +15,7 @@ def test_case():
 FX_SEARCH_CODE = "client=firefox-b-1-d"
 
 
+@pytest.mark.unstable
 def test_search_code_google_us(driver: Firefox):
     """
     C1365268 - Default Search Code: Google - US

tests/address_bar_and_search/test_search_term_persists.py

@@ -24,6 +24,7 @@ def add_prefs():
 SECOND_SEARCH = "lion"
 
 
+@pytest.mark.unstable
 def test_search_term_persists(driver: Firefox):
     """
     C2153943 - Persist search term basic functionality

tests/bookmarks_and_history/test_delete_bookmarks_from_toolbar.py

@@ -14,7 +14,6 @@ def test_case():
 URL_TO_BOOKMARK = "https://www.mozilla.org/"
 
 
-@pytest.mark.ci
 @pytest.mark.headed
 def test_delete_bookmarks_from_toolbar(driver: Firefox):
     """

tests/form_autofill/test_telephone_autofill_attribute.py

@@ -13,16 +13,14 @@ def test_case():
     return "122361"
 
 
-countries = ["CA", "US"]
-
-
 @pytest.mark.ci
-@pytest.mark.parametrize("country_code", countries)
-def test_telephone_attribute_autofill(driver: Firefox, country_code: str):
+def test_telephone_attribute_autofill(driver: Firefox):
     """
     C122361, ensures that telephone numbers are autofilled
     """
     # instantiate objects
+    # removed CA support to make test cycle faster
+    country_code = "US"
     address_fill_obj = AddressFill(driver).open()
     autofill_popup_obj = AutofillPopup(driver)
     util = Utilities()

tests/menus/test_image_context_menu_actions.py

@@ -52,6 +52,7 @@ def test_open_image_in_new_tab(driver: Firefox):
     wiki_image_page.verify_opened_image_url("wikimedia", LOADED_IMAGE_URL)
 
 
+@pytest.mark.ci
 @pytest.mark.headed
 def test_save_image_as(driver: Firefox, sys_platform, delete_files):
     """