Skip to content

Remove code to skip Python 3 tests on ST2 < 3.0.1 #196

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

Merged
blag merged 1 commit into from
Dec 28, 2020
Merged

Remove code to skip Python 3 tests on ST2 < 3.0.1 #196

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
21 changes: 0 additions & 21 deletions cli/test_pack_python3.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
load '../test_helpers/bats-support/load'
load '../test_helpers/bats-assert/load'

skip_tests_if_st2_le_v3() {
# Utility function which skips tests if st2 is v3.0.0 or below. The py3 tests
# here require the fix https://github.com/StackStorm/st2/pull/4674 that will
# not be released until v3.0.1.

ST2_VER=$(st2 --version 2>&1)
ST2_VER=$(echo ${ST2_VER} | cut -d',' -f1)
ST2_VER=$(echo ${ST2_VER} | cut -d' ' -f2)
ST2_VER=$(echo ${ST2_VER} | sed -e "s/dev/.0/g")
ST2_VER=$(echo ${ST2_VER//.})

if [[ "${ST2_VER}" -le "300" ]]; then
skip "Python 3 imports are broken on StackStorm < 3.0.1, skipping tests"
fi
}

skip_tests_if_python3_is_not_available_or_if_already_running_under_python3() {
# Utility function which skips tests if python3 binary is not available on the system or if
# StackStorm components are already running under Python 3 (e.g. Ubuntu Xenial)
Expand All @@ -32,7 +16,6 @@ skip_tests_if_python3_is_not_available_or_if_already_running_under_python3() {
}

@test "SETUP: Install and register examples pack" {
skip_tests_if_st2_le_v3
skip_tests_if_python3_is_not_available_or_if_already_running_under_python3

if [[ ! -d /opt/stackstorm/packs/examples ]]; then
Expand All @@ -49,7 +32,6 @@ skip_tests_if_python3_is_not_available_or_if_already_running_under_python3() {
}

@test "packs.setup_virtualenv without python3 flags works and defaults to Python 2" {
skip_tests_if_st2_le_v3
skip_tests_if_python3_is_not_available_or_if_already_running_under_python3

SETUP_VENV_RESULTS=$(st2 run packs.setup_virtualenv packs=examples -j)
Expand All @@ -67,7 +49,6 @@ skip_tests_if_python3_is_not_available_or_if_already_running_under_python3() {
}

@test "packs.setup_virtualenv with python3 flag works" {
skip_tests_if_st2_le_v3
skip_tests_if_python3_is_not_available_or_if_already_running_under_python3

SETUP_VENV_RESULTS=$(st2 run packs.setup_virtualenv packs=examples python3=true -j)
Expand Down Expand Up @@ -107,7 +88,6 @@ skip_tests_if_python3_is_not_available_or_if_already_running_under_python3() {
}

@test "python3 imports work correctly" {
skip_tests_if_st2_le_v3
skip_tests_if_python3_is_not_available_or_if_already_running_under_python3

run st2 pack install python3_test --python3 -j
Expand All @@ -120,7 +100,6 @@ skip_tests_if_python3_is_not_available_or_if_already_running_under_python3() {
}

@test "TEARDOWN: Uninstall examples and python3_test pack" {
skip_tests_if_st2_le_v3
skip_tests_if_python3_is_not_available_or_if_already_running_under_python3

if [[ -d /opt/stackstorm/packs/examples ]]; then
Expand Down