Skip to content

Commit

Permalink
Merge pull request conda#689 from maresb/pytest-split-2
Browse files Browse the repository at this point in the history
Split tests into multiple runners with pytest-split
  • Loading branch information
maresb authored Sep 10, 2024
2 parents 886b474 + 392b8ef commit 7da401d
Show file tree
Hide file tree
Showing 7 changed files with 1,141 additions and 3 deletions.
84 changes: 81 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,59 @@ env:

jobs:
test:
runs-on: ${{ matrix.os }}
name: pytest py${{ matrix.python-version }} on ${{ matrix.os }} (${{ matrix.pytest-split-group-index }}/${{ matrix.pytest-split-group-size }})
runs-on: ${{ matrix.os }}-latest
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ ubuntu, macos, windows ]
python-version: [ "3.8", "3.12" ]

# pytest-split handles dividing the tests into n groups indexed 1...n.
# The tests are automatically split so that the expected duration of each
# group is roughly the same.
# See the "exclude" section below for pruning to the group sizes,
# and the "include" section for defining the group sizes.
pytest-split-group-index: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]

exclude:
- os: windows
python-version: "3.8"

# Prune the indices so that we only run the splits up to the group size
# defined below in "include". (This is ugly but effective.)
- os: ubuntu
pytest-split-group-index: 5
- os: ubuntu
pytest-split-group-index: 6
- os: ubuntu
pytest-split-group-index: 7
- os: ubuntu
pytest-split-group-index: 8
- os: ubuntu
pytest-split-group-index: 9
- os: ubuntu
pytest-split-group-index: 10
- os: macos
pytest-split-group-index: 5
- os: macos
pytest-split-group-index: 6
- os: macos
pytest-split-group-index: 7
- os: macos
pytest-split-group-index: 8
- os: macos
pytest-split-group-index: 9
- os: macos
pytest-split-group-index: 10
include:
- os: ubuntu
pytest-split-group-size: 4
- os: macos
pytest-split-group-size: 4
- os: windows
pytest-split-group-size: 10

defaults:
run:
shell: bash -eo pipefail -l {0}
Expand Down Expand Up @@ -64,7 +111,10 @@ jobs:
pytest \
--cov=conda_lock --cov-branch --cov-report=xml --cov-report=term \
--store-durations \
--clean-durations \
--durations-path "${{ github.workspace }}/tests/durations/${{ matrix.os }}-py${{ matrix.python-version }}.json" \
--splits="${{ matrix.pytest-split-group-size }}" \
--group="${{ matrix.pytest-split-group-index }}" \
tests
cp coverage.xml "${{ github.workspace }}"
Expand All @@ -78,5 +128,33 @@ jobs:
- name: Store test durations
uses: actions/upload-artifact@v4
with:
name: test-durations-${{ matrix.os }}-py${{ matrix.python-version }}
name: test-durations-${{ matrix.os }}-py${{ matrix.python-version }}-${{ matrix.pytest-split-group-index }}
path: tests/durations/${{ matrix.os }}-py${{ matrix.python-version }}.json

aggregate-durations:
name: Aggregate test durations
runs-on: ubuntu-latest
needs: test
steps:
- name: Download test durations
uses: actions/download-artifact@v4
# All the artifacts are downloaded into various subdirectories.
# For each filename that occurs, we need to find all the files in the
# subdirectories with the same name, group those, and merge them.
- name: Construct the list of filenames to aggregate and write them to temp/filenames.txt
id: construct-filenames
run: |
mkdir temp
find . -type f -name '*.json' | xargs -n1 basename | sort | uniq > temp/filenames.txt
cat temp/filenames.txt
- name: Aggregate test durations
run: |
mkdir aggregated
while read -r filename; do
jq -s 'add' $(find . -type f -name "$filename") > "aggregated/$filename"
done < temp/filenames.txt
- name: Upload aggregated test durations
uses: actions/upload-artifact@v4
with:
name: aggregated-test-durations
path: aggregated
10 changes: 10 additions & 0 deletions tests/durations/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# pytest-split durations

This directory contains test durations as they were computed by pytest-split
running from GitHub Actions.

They should occasionally be replaced so that the split remains optimal.
(Tests that are missing from this list will be assigned the average duration.)

For more details, see the
[pytest-split documentation](https://jerry-git.github.io/pytest-split/).
Loading

0 comments on commit 7da401d

Please sign in to comment.