diff --git a/ci/testkomodo.sh b/ci/testkomodo.sh index 2a551fbea29..ac9300936c4 100755 --- a/ci/testkomodo.sh +++ b/ci/testkomodo.sh @@ -1,5 +1,6 @@ copy_test_files () { cp -r ${CI_SOURCE_ROOT}/tests ${CI_TEST_ROOT} + cp -r ${CI_SOURCE_ROOT}/docs ${CI_TEST_ROOT}/docs ln -s ${CI_SOURCE_ROOT}/test-data ${CI_TEST_ROOT}/test-data ln -s ${CI_SOURCE_ROOT}/src ${CI_TEST_ROOT}/src @@ -33,7 +34,21 @@ run_ert_with_opm () { popd } -start_tests () { +run_everest_tests () { + if [[ ! -z "$CI_PR_RUN" ]]; then + # ignore some tests for komodo testing + python -m pytest tests/everest -s --ignore-glob "*test_ui*" \ + --ignore-glob "*test_visualization_entry*" \ + -m "not simulation_test and not ui_test and not redundant_test" + else + python -m pytest tests/everest -s \ + --ignore-glob "*test_visualization_entry*" \ + -m "not simulation_test and not redundant_test and not ui_test" + xvfb-run -s "-screen 0 640x480x24" --auto-servernum python -m pytest tests/everest -s -m "ui_test" + fi +} + +run_ert_tests () { export NO_PROXY=localhost,127.0.0.1 export ECL_SKIP_SIGNAL=ON @@ -63,7 +78,6 @@ start_tests () { rm -rf "$basetemp" || true popd - run_ert_with_opm retun_code_4=$? @@ -76,5 +90,9 @@ start_tests () { return 1 fi done +} +start_tests () { + run_ert_tests + run_everest_tests }