Leverage merge_queue

Author: schloerke

.github/py-shiny/pytest-browsers/action.yaml

@@ -0,0 +1,19 @@
+name: 'Custom merge queue browsers'
+description: 'Trim down pytest browsers to just chrome for merge_group events.'
+outputs:
+  browsers:
+    description: 'pytest browsers to use'
+    value: ${{ steps.browsers.outputs.browser }}
+runs:
+  using: "composite"
+  steps:
+      - name: Determine browsers to use
+        shell: bash
+        id: browsers
+        run: |
+          if [ "${{ github.event_name }}" == "merge_group" ]; then
+            echo "Using chrome browser only!"
+            echo 'browsers=PYTEST_BROWSER="--browser chromium"' >> "$GITHUB_OUTPUT"
+          else
+            echo "No custom pytest browsers"
+          fi

.github/workflows/pytest.yaml

@@ -65,10 +65,12 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - uses: ./.github/py-shiny/pytest-browers
+        id: browsers
       - name: Run End-to-End tests
         timeout-minutes: 20
         run: |
-          make playwright-shiny SUB_FILE=". -vv"
+          make playwright-shiny SUB_FILE=". -vv" ${{ steps.browsers.outputs.browsers }}
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
@@ -103,10 +105,12 @@ jobs:
         run: |
           npm ci
 
+      - uses: ./.github/py-shiny/pytest-browers
+        id: browsers
       - name: Run example app tests
         timeout-minutes: 20
         run: |
-          make playwright-examples SUB_FILE=". -vv"
+          make playwright-examples SUB_FILE=". -vv" ${{ steps.browsers.outputs.browsers }}
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

Makefile

@@ -147,7 +147,7 @@ clean-js: FORCE
 
 # Default `SUB_FILE` to empty
 SUB_FILE:=
-
+PYTEST_BROWSERS:= --browser webkit --browser firefox --browser chromium
 install-playwright: FORCE
 	playwright install --with-deps
 
@@ -160,15 +160,15 @@ install-rsconnect: FORCE
 
 # end-to-end tests with playwright; (SUB_FILE="" within tests/playwright/shiny/)
 playwright-shiny: install-playwright
-	pytest tests/playwright/shiny/$(SUB_FILE)
+	pytest tests/playwright/shiny/$(SUB_FILE) $(PYTEST_BROWSERS)
 
 # end-to-end tests on deployed apps with playwright; (SUB_FILE="" within tests/playwright/deploys/)
 playwright-deploys: install-playwright install-rsconnect
-	pytest tests/playwright/deploys/$(SUB_FILE)
+	pytest tests/playwright/deploys/$(SUB_FILE) $(PYTEST_BROWSERS)
 
 # end-to-end tests on all py-shiny examples with playwright; (SUB_FILE="" within tests/playwright/examples/)
 playwright-examples: install-playwright
-	pytest tests/playwright/examples/$(SUB_FILE)
+	pytest tests/playwright/examples/$(SUB_FILE) $(PYTEST_BROWSERS)
 
 playwright-debug: install-playwright ## All end-to-end tests, chrome only, headed; (SUB_FILE="" within tests/playwright/)
 	pytest -c tests/playwright/playwright-pytest.ini tests/playwright/$(SUB_FILE)
@@ -178,10 +178,10 @@ playwright-show-trace: ## Show trace of failed tests
 
 # end-to-end tests with playwright and generate junit report
 testrail-junit: install-playwright install-trcli
-	pytest tests/playwright/shiny/$(SUB_FILE) --junitxml=report.xml
+	pytest tests/playwright/shiny/$(SUB_FILE) --junitxml=report.xml $(PYTEST_BROWSERS)
 
 coverage: FORCE ## check combined code coverage (must run e2e last)
-	pytest --cov-report term-missing --cov=shiny tests/pytest/ tests/playwright/shiny/$(SUB_FILE)
+	pytest --cov-report term-missing --cov=shiny tests/pytest/ tests/playwright/shiny/$(SUB_FILE) $(PYTEST_BROWSERS)
 	coverage html
 	$(BROWSER) htmlcov/index.html
 

pytest.ini

@@ -1,4 +1,5 @@
 [pytest]
 asyncio_mode=strict
 testpaths=tests/pytest/
-addopts = --strict-markers --durations=6 --durations-min=5.0 --browser webkit --browser firefox --browser chromium --numprocesses auto   --tracing=retain-on-failure --video=retain-on-failure
+; Note: Browsers are set within `./Makefile`
+addopts = --strict-markers --durations=6 --durations-min=5.0 --numprocesses auto --tracing=retain-on-failure --video=retain-on-failure