Skip to content

Commit

Permalink
Make sourcing of eclrun non-flaky
Browse files Browse the repository at this point in the history
If there is a simple bash test that fails in the sourced file, the sourcing
will fail when it is run in an environment where 'set -e' is set. Ensure
this is temporarily unset
  • Loading branch information
berland committed Feb 12, 2025
1 parent 203d4df commit b5e7033
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions ci/testkomodo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ get_os_arch () {

start_tests () {
os_arch="$(get_os_arch)"

SHELLOPTS_BEFORE=$(set +o)
set +e
# (this script becomes flaky if set -e is active)
source /prog/res/ecl/script/eclrun.bash
eval "$SHELLOPTS_BEFORE"

pytest -n auto --flow-simulator="/project/res/$os_arch/bin/flowdaily" --eclipse-simulator="eclrun"
}

0 comments on commit b5e7033

Please sign in to comment.