Skip to content

Commit

Permalink
Separate gui and cli tests for speed
Browse files Browse the repository at this point in the history
  • Loading branch information
eivindjahren committed Sep 16, 2024
1 parent 40d198b commit aaf77b0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
test-type: [ 'performance-tests', 'unit-tests', 'ui-tests' ]
test-type: [ 'performance-tests', 'unit-tests', 'gui-tests', 'cli-tests' ]
python-version: [ '3.8', '3.11', '3.12' ]
os: [ ubuntu-latest ]
uses: ./.github/workflows/test_ert.yml
Expand All @@ -58,7 +58,7 @@ jobs:
strategy:
fail-fast: false
matrix:
test-type: [ 'performance-tests', 'unit-tests', 'ui-tests' ]
test-type: [ 'performance-tests', 'unit-tests', 'gui-tests', 'cli-tests' ]
python-version: [ '3.8', '3.12' ]
os: [ 'macos-13', 'macos-14', 'macos-14-large']
exclude:
Expand All @@ -80,7 +80,7 @@ jobs:
strategy:
fail-fast: false
matrix:
test-type: [ 'performance-tests', 'unit-tests', 'ui-tests' ]
test-type: [ 'performance-tests', 'unit-tests', 'gui-tests', 'cli-tests' ]
python-version: [ '3.12' ]
os: [ 'macos-latest' ]
uses: ./.github/workflows/test_ert.yml
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/test_ert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,15 @@ jobs:
run: |
uv pip install ".[dev]"
- name: UI Test
if: inputs.test-type == 'ui-tests'
- name: GUI Test
if: inputs.test-type == 'gui-tests'
run: |
pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -v --mpl --benchmark-disable tests/ui_tests/gui
pytest --cov=ert --cov-report=xml:cov2.xml --junit-xml=junit.xml -n logical -v --benchmark-disable --dist loadgroup tests/ui_tests/cli
- name: CLI Test
if: inputs.test-type == 'cli-tests'
run: |
pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -n logical -v --benchmark-disable --dist loadgroup tests/ui_tests/cli
- name: Unit Test
if: inputs.test-type == 'unit-tests'
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ fixes:
comment:
# The code coverage is made up of 4 test runs so only after all coverage
# reports have been uploaded will the comparison be sane
after_n_builds: 12
after_n_builds: 16

0 comments on commit aaf77b0

Please sign in to comment.