Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Turn on gui tests for mac #6095

Merged
merged 1 commit into from
Sep 19, 2023
+3 −11
Merged

Turn on gui tests for mac #6095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
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.10' ]
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
5 changes: 2 additions & 3 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import pkgutil
import resource
import shutil
import sys
from argparse import ArgumentParser
from os.path import dirname
from typing import TYPE_CHECKING, cast
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 Expand Up @@ -214,8 +215,6 @@ def _qt_excepthook(monkeypatch):

"""

import sys

from qtpy.QtWidgets import QApplication

next_excepthook = sys.excepthook
Expand Down
Loading