matplotlib · QuLogic · Aug 3, 2022 · Aug 3, 2022 · Aug 3, 2022 · Aug 3, 2022
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -62,6 +62,8 @@ install:
   - activate mpl-dev
   - conda install -c conda-forge pywin32
   - echo %PYTHON_VERSION% %TARGET_ARCH%
+  # Install browsers for testing
+  - playwright install --with-deps
   # Show the installed packages + versions
   - conda list
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -197,10 +197,10 @@ jobs:
             ~/.cache/matplotlib
             !~/.cache/matplotlib/tex.cache
             !~/.cache/matplotlib/test_cache
-          key: 4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
+          key: 5-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
           restore-keys: |
-            4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
-            4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
+            5-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
+            5-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
 
       - name: Install Python dependencies
         run: |
@@ -281,6 +281,9 @@ jobs:
             --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
             --upgrade --only-binary=:all: numpy pandas
 
+      - name: Install browsers for testing
+        run: playwright install --with-deps
+
       - name: Install Matplotlib
         run: |
           ccache -s
@@ -311,6 +314,8 @@ jobs:
       - name: Run pytest
         run: |
           pytest -rfEsXR -n auto \
+            --browser chromium --browser firefox --browser webkit \
+            --slowmo=100 --tracing=on --video=on \
             --maxfail=50 --timeout=300 --durations=25 \
             --cov-report=xml --cov=lib --log-level=DEBUG --color=yes
 
@@ -377,6 +382,12 @@ jobs:
           name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }} result images"
           path: ./result_images
 
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }} playwright"
+          path: ./test-results
+
   # Separate dependent job to only upload one issue from the matrix of jobs
   create-issue:
     if: ${{ failure() && github.event_name == 'schedule' }}

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -163,6 +163,9 @@ stages:
                 --verbose --editable .[dev]
             displayName: "Install self"
 
+          - bash: playwright install --with-deps
+            displayName: 'Install browsers for testing'
+
           - script: env
             displayName: 'print env'
 
@@ -225,6 +228,7 @@ stages:
               fi
               PYTHONFAULTHANDLER=1 pytest -rfEsXR -n 2 \
                   --maxfail=50 --timeout=300 --durations=25 \
+                  --browser chromium --browser firefox --browser webkit \
                   --junitxml=junit/test-results.xml --cov-report=xml --cov=lib
               if [[ -n $SESSION_ID ]]; then
                 if [[ $VS_VER == 2022 ]]; then

diff --git a/environment.yml b/environment.yml
@@ -56,6 +56,8 @@ dependencies:
   - nbconvert[execute]!=6.0.0,!=6.0.1,!=7.3.0,!=7.3.1
   - nbformat!=5.0.0,!=5.0.1
   - pandas!=0.25.0
+  - pip:
+      - pytest-playwright
   - psutil
   - pre-commit
   - pydocstyle>=5.1.0

diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
@@ -234,9 +234,9 @@ def random_ports(port, n):
             cls.address = mpl.rcParams['webagg.address']
         else:
             cls.address = address
-        cls.port = mpl.rcParams['webagg.port']
-        for port in random_ports(cls.port,
-                                 mpl.rcParams['webagg.port_retries']):
+        if port is None:
+            port = mpl.rcParams['webagg.port']
+        for port in random_ports(port, mpl.rcParams['webagg.port_retries']):
             try:
                 app.listen(port, cls.address)
             except OSError as e:

diff --git a/lib/matplotlib/tests/baseline_images/test_backend_webagg/chromium.png b/lib/matplotlib/tests/baseline_images/test_backend_webagg/chromium.png
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_webagg/firefox.png b/lib/matplotlib/tests/baseline_images/test_backend_webagg/firefox.png
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_webagg/webkit.png b/lib/matplotlib/tests/baseline_images/test_backend_webagg/webkit.png
diff --git a/lib/matplotlib/tests/conftest.py b/lib/matplotlib/tests/conftest.py
@@ -1,2 +1,20 @@
+import contextlib
+import socket
+
+import pytest
+
 from matplotlib.testing.conftest import (  # noqa
     mpl_test_settings, pytest_configure, pytest_unconfigure, pd, xr)
+
+
+@pytest.fixture
+def random_port():
+    with contextlib.closing(
+            socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
+        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        s.bind(('', 0))
+        s.listen(1)
+        addr = s.getsockname()
+        port = addr[1]
+
+    return port