Skip to content

Commit

Permalink
Turn on gui tests for mac
Browse files Browse the repository at this point in the history
Only test Python 3.11 to save time.
Increased time-out to 15min as gui-tests are for some reason
slower than they are on ubuntu.
Co-authored by: Eivind <[email protected]>

Commitin
  • Loading branch information
dafeda committed Sep 18, 2023
1 parent fd77002 commit 199395a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ '3.8', '3.9', '3.10', '3.11' ]
python-version: [ '3.11' ]
uses: ./.github/workflows/build-wheels-macos.yml
with:
python-version: ${{ matrix.python-version }}
Expand Down Expand Up @@ -123,16 +123,9 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ '3.8', '3.9', '3.10', '3.11' ]
python-version: [ '3.11' ]
os: [ macos-latest ]
test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ]
exclude:
- os: macos-latest
python-version: '3.9'
- os: macos-latest
test-type: 'gui-test'
- os: macos-latest
python-version: '3.10'
uses: ./.github/workflows/test_ert.yml
with:
os: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_ert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

- name: Test GUI
if: inputs.test-type == 'gui-test'
timeout-minutes: 10
timeout-minutes: 15
run: |
pytest tests --junit-xml=junit.xml -sv --mpl -m "requires_window_manager" --benchmark-disable
Expand Down
3 changes: 2 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import sys
import fileinput
import os
import pkgutil
Expand Down Expand Up @@ -180,7 +181,7 @@ def mock_connect(monkeypatch):

@pytest.fixture(scope="session", autouse=True)
def hide_window(request):
if request.config.getoption("--show-gui"):
if sys.platform == "darwin" or request.config.getoption("--show-gui"):
yield
return

Expand Down

0 comments on commit 199395a

Please sign in to comment.