aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-12-02 11:36:46 -0800
committerEli Schwartz <eschwartz93@gmail.com>2021-12-06 20:06:14 -0500
commit7191b6dab2b310adb93238bac804008e9c9757b8 (patch)
tree10989ef5073f5000e789ea37977af4dafe2bb6e3
parentd0b651525e5ed6e7ac8e481ddb02ece56ceb9313 (diff)
downloadmeson-7191b6dab2b310adb93238bac804008e9c9757b8.zip
meson-7191b6dab2b310adb93238bac804008e9c9757b8.tar.gz
meson-7191b6dab2b310adb93238bac804008e9c9757b8.tar.bz2
ci: install pytest-subtests
Which lets pytest understand unittest.subtest
-rw-r--r--.github/workflows/cygwin.yml2
-rw-r--r--.github/workflows/macos.yml2
-rw-r--r--.github/workflows/msys2.yml2
-rw-r--r--ci/ciimage/common.sh1
-rw-r--r--ci/run.ps12
5 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 960dfa6..9dd1355 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -74,7 +74,7 @@ jobs:
- name: Run pip
run: |
export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
- python3 -m pip --disable-pip-version-check install gcovr jsonschema pefile pytest pytest-xdist coverage codecov
+ python3 -m pip --disable-pip-version-check install gcovr jsonschema pefile pytest pytest-subtests pytest-xdist coverage codecov
shell: C:\cygwin\bin\bash.exe --noprofile --norc -o igncr -eo pipefail '{0}'
- name: Run tests
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a791aff..d60244b 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -30,7 +30,7 @@ jobs:
python-version: '3.x'
- run: |
python -m pip install --upgrade pip
- python -m pip install pytest pytest-xdist jsonschema coverage codecov
+ python -m pip install pytest pytest-xdist pytest-subtests jsonschema coverage codecov
- run: brew install pkg-config ninja llvm qt@5
- env:
CPPFLAGS: "-I/usr/local/include"
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index f777221..4ba435e 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -79,7 +79,7 @@ jobs:
- name: Install dependencies
run: |
- python3 -m pip --disable-pip-version-check install gcovr jsonschema pefile pytest pytest-xdist coverage codecov
+ python3 -m pip --disable-pip-version-check install gcovr jsonschema pefile pytest pytest-subtests pytest-xdist coverage codecov
- name: Run Tests
run: |
diff --git a/ci/ciimage/common.sh b/ci/ciimage/common.sh
index 707b751..68a4dae 100644
--- a/ci/ciimage/common.sh
+++ b/ci/ciimage/common.sh
@@ -13,6 +13,7 @@ set -x
base_python_pkgs=(
pytest
pytest-xdist
+ pytest-subtests
coverage
codecov
jsonschema
diff --git a/ci/run.ps1 b/ci/run.ps1
index f294d4d..33a01fe 100644
--- a/ci/run.ps1
+++ b/ci/run.ps1
@@ -81,7 +81,7 @@ python --version
# Needed for running unit tests in parallel.
echo ""
-python -m pip --disable-pip-version-check install --upgrade pefile pytest-xdist jsonschema coverage
+python -m pip --disable-pip-version-check install --upgrade pefile pytest-xdist pytest-subtests jsonschema coverage
echo ""
echo "=== Start running tests ==="