figure out why mac runs zombie

mozilla · Jul 19, 2024 · 3663b9a · 3663b9a
1 parent 4dab12e
commit 3663b9a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -46,5 +46,5 @@ jobs:
           rm ./pyproject.toml;
           mv ./ci_pyproject.toml ./pyproject.toml;
           pipenv install;
-      - name: Run Smoke Tests in Win
-        run: pipenv run pytest --fx-executable ./firefox/firefox -n 4 .
+      - name: Run Smoke Tests in MacOS
+        run: pipenv run pytest --fx-executable ./firefox/firefox -n 4 tests/[amt]*
diff --git a/tests/address_bar_and_search/test_google_search_counts_us.py b/tests/address_bar_and_search/test_google_search_counts_us.py
@@ -1,12 +1,18 @@
+import sys
+from os import environ
 from time import sleep
 
+import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object import Navigation
 from modules.page_object import AboutTelemetry
 from modules.util import Utilities
 
+MAC_GHA = environ.get("GITHUB_ACTIONS") and sys.platform.startswith("darwin")
 
+
+@pytest.mark.skipif(MAC_GHA, reason="Test unstable in MacOS Github Actions")
 def test_google_search_counts_us(driver: Firefox):
     """
     C1365026, Test Google Search counts - urlbar US

diff --git a/tests/address_bar_and_search/test_google_withads_url_bar_us.py b/tests/address_bar_and_search/test_google_withads_url_bar_us.py
@@ -13,6 +13,13 @@ def add_prefs():
     return [("cookiebanners.service.mode", 1)]
 
 
+import sys
+from os import environ
+
+MAC_GHA = environ.get("GITHUB_ACTIONS") and sys.platform.startswith("darwin")
+
+
+@pytest.mark.skipif(MAC_GHA, reason="Test unstable in MacOS Github Actions")
 def test_google_withads_url_bar_us(driver: Firefox):
     """
     C1365070, verify that Google withads URL bar - US is recorder into telemetry