From 59bc7746c238fc71605b238b4dc1bf0aecb071b7 Mon Sep 17 00:00:00 2001 From: Eivind Jahren Date: Mon, 7 Oct 2024 07:08:25 +0200 Subject: [PATCH] Fix timeout issue with macos-14-large --- .github/workflows/build_and_test.yml | 2 +- tests/ert/ui_tests/cli/test_cli.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 665b5655156..2ca9e767467 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -107,7 +107,7 @@ jobs: matrix: test-type: [ 'test', 'integration-test', 'everest-models-test' ] python-version: [ '3.8', '3.12' ] - os: [ 'macos-13', 'macos-14'] + os: [ 'macos-13', 'macos-14', 'macos-14-large'] exclude: - os: 'macos-14' python-version: '3.8' diff --git a/tests/ert/ui_tests/cli/test_cli.py b/tests/ert/ui_tests/cli/test_cli.py index b7ea9979288..ed45c984885 100644 --- a/tests/ert/ui_tests/cli/test_cli.py +++ b/tests/ert/ui_tests/cli/test_cli.py @@ -326,7 +326,6 @@ def test_that_setenv_sets_environment_variables_in_jobs(setenv_config): assert lines[3].strip() == "fourth:foo" -@pytest.mark.timeout(30) @pytest.mark.usefixtures("copy_poly_case") @pytest.mark.parametrize( (