Skip to content

Commit

Permalink
Adjust skip_if_travis to be generic skip_if_ci and work on github osx…
Browse files Browse the repository at this point in the history
… as well

Apparently that test was "always" skipped, so we will just do the same
on github actions for now
  • Loading branch information
yarikoptic committed Apr 30, 2024
1 parent f53926f commit 1c700f4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions scripts/tests/test_helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ pull_singularity_shim () {
fi
}

skip_if_travis_osx() {
if [ "$TRAVIS_OS_NAME" = osx ]
skip_if_ci_osx() {
if [ "$TRAVIS_OS_NAME" = osx ] || ( [ -n "GITHUB_ENV" ] && [ "$RUNNER_OS" = "macOS" ] )
then
skip "$@"
fi
Expand Down
8 changes: 4 additions & 4 deletions scripts/tests/test_singularity_cmd.bats
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,26 @@ git annex get "$arg_test_img"

# bats test_tags=docker
@test "verifying ability to singularity exec under /tmp subdir" {
skip_if_travis_osx "skipping Singularity directory test on Travis OSX"
skip_if_ci_osx "skipping Singularity directory test on Travis OSX"
check_subdir "$(_mktemp_dir_under /tmp)"
}

# bats test_tags=docker
@test "verifying ability to singularity exec under /tmp subdir (explicit use of docker)" {
skip_if_travis_osx "skipping Singularity directory test on Travis OSX"
skip_if_ci_osx "skipping Singularity directory test on Travis OSX"
export REPRONIM_USE_DOCKER=1
check_subdir "$(_mktemp_dir_under /tmp)"
}

# bats test_tags=docker
@test "verifying ability to singularity exec under $HOME subdir" {
skip_if_travis_osx "skipping Singularity directory test on Travis OSX"
skip_if_ci_osx "skipping Singularity directory test on Travis OSX"
check_subdir "$(_mktemp_dir_under $HOME)"
}

# bats test_tags=docker
@test "verifying ability to singularity exec under $HOME subdir (explicit use of docker)" {
skip_if_travis_osx "skipping Singularity directory test on Travis OSX"
skip_if_ci_osx "skipping Singularity directory test on Travis OSX"
export REPRONIM_USE_DOCKER=1
check_subdir "$(_mktemp_dir_under $HOME)"
}
Expand Down

0 comments on commit 1c700f4

Please sign in to comment.