Skip to content

Commit

Permalink
distgen generated content
Browse files Browse the repository at this point in the history
  • Loading branch information
zmiklank committed Apr 12, 2023
1 parent 6ad0170 commit 2d29a2c
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 21 deletions.
10 changes: 7 additions & 3 deletions 2.7/test/run
Original file line number Diff line number Diff line change
Expand Up @@ -303,19 +303,23 @@ for app in ${@:-${WEB_APPS[@]}}; do
fi

prepare ${app}
if [ $? -ne 0 ]; then
ct_update_test_result "[FAILED]" "${app}" "preparation"
TESTSUITE_RESULT=1
continue
fi
run_s2i_build ${app}
RESULT=$?
msg_run_s2i_build="'${app}' run_s2i_build"
if [[ "$app" == *"-should-fail-"* ]]; then
# Tests with '-should-fail-' in their name should fail during a build, expecting non-zero exit status
check_type $RESULT "negative"
test "$?" == "0" && test_msg="[PASSED]" || test_msg="[FAILED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
continue
else
check_type $RESULT
test "$?" != "0" && test_msg="[FAILED]" || test_msg="[PASSED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
fi
echo ""
TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "${app}"
Expand Down
10 changes: 7 additions & 3 deletions 3.10/test/run
Original file line number Diff line number Diff line change
Expand Up @@ -303,19 +303,23 @@ for app in ${@:-${WEB_APPS[@]}}; do
fi

prepare ${app}
if [ $? -ne 0 ]; then
ct_update_test_result "[FAILED]" "${app}" "preparation"
TESTSUITE_RESULT=1
continue
fi
run_s2i_build ${app}
RESULT=$?
msg_run_s2i_build="'${app}' run_s2i_build"
if [[ "$app" == *"-should-fail-"* ]]; then
# Tests with '-should-fail-' in their name should fail during a build, expecting non-zero exit status
check_type $RESULT "negative"
test "$?" == "0" && test_msg="[PASSED]" || test_msg="[FAILED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
continue
else
check_type $RESULT
test "$?" != "0" && test_msg="[FAILED]" || test_msg="[PASSED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
fi
echo ""
TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "${app}"
Expand Down
10 changes: 7 additions & 3 deletions 3.11/test/run
Original file line number Diff line number Diff line change
Expand Up @@ -303,19 +303,23 @@ for app in ${@:-${WEB_APPS[@]}}; do
fi

prepare ${app}
if [ $? -ne 0 ]; then
ct_update_test_result "[FAILED]" "${app}" "preparation"
TESTSUITE_RESULT=1
continue
fi
run_s2i_build ${app}
RESULT=$?
msg_run_s2i_build="'${app}' run_s2i_build"
if [[ "$app" == *"-should-fail-"* ]]; then
# Tests with '-should-fail-' in their name should fail during a build, expecting non-zero exit status
check_type $RESULT "negative"
test "$?" == "0" && test_msg="[PASSED]" || test_msg="[FAILED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
continue
else
check_type $RESULT
test "$?" != "0" && test_msg="[FAILED]" || test_msg="[PASSED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
fi
echo ""
TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "${app}"
Expand Down
10 changes: 7 additions & 3 deletions 3.6/test/run
Original file line number Diff line number Diff line change
Expand Up @@ -303,19 +303,23 @@ for app in ${@:-${WEB_APPS[@]}}; do
fi

prepare ${app}
if [ $? -ne 0 ]; then
ct_update_test_result "[FAILED]" "${app}" "preparation"
TESTSUITE_RESULT=1
continue
fi
run_s2i_build ${app}
RESULT=$?
msg_run_s2i_build="'${app}' run_s2i_build"
if [[ "$app" == *"-should-fail-"* ]]; then
# Tests with '-should-fail-' in their name should fail during a build, expecting non-zero exit status
check_type $RESULT "negative"
test "$?" == "0" && test_msg="[PASSED]" || test_msg="[FAILED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
continue
else
check_type $RESULT
test "$?" != "0" && test_msg="[FAILED]" || test_msg="[PASSED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
fi
echo ""
TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "${app}"
Expand Down
10 changes: 7 additions & 3 deletions 3.8/test/run
Original file line number Diff line number Diff line change
Expand Up @@ -303,19 +303,23 @@ for app in ${@:-${WEB_APPS[@]}}; do
fi

prepare ${app}
if [ $? -ne 0 ]; then
ct_update_test_result "[FAILED]" "${app}" "preparation"
TESTSUITE_RESULT=1
continue
fi
run_s2i_build ${app}
RESULT=$?
msg_run_s2i_build="'${app}' run_s2i_build"
if [[ "$app" == *"-should-fail-"* ]]; then
# Tests with '-should-fail-' in their name should fail during a build, expecting non-zero exit status
check_type $RESULT "negative"
test "$?" == "0" && test_msg="[PASSED]" || test_msg="[FAILED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
continue
else
check_type $RESULT
test "$?" != "0" && test_msg="[FAILED]" || test_msg="[PASSED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
fi
echo ""
TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "${app}"
Expand Down
10 changes: 7 additions & 3 deletions 3.9-minimal/test/run
Original file line number Diff line number Diff line change
Expand Up @@ -299,19 +299,23 @@ for app in ${@:-${WEB_APPS[@]}}; do
fi

prepare ${app}
if [ $? -ne 0 ]; then
ct_update_test_result "[FAILED]" "${app}" "preparation"
TESTSUITE_RESULT=1
continue
fi
run_s2i_build ${app}
RESULT=$?
msg_run_s2i_build="'${app}' run_s2i_build"
if [[ "$app" == *"-should-fail-"* ]]; then
# Tests with '-should-fail-' in their name should fail during a build, expecting non-zero exit status
check_type $RESULT "negative"
test "$?" == "0" && test_msg="[PASSED]" || test_msg="[FAILED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
continue
else
check_type $RESULT
test "$?" != "0" && test_msg="[FAILED]" || test_msg="[PASSED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
fi
echo ""
TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "${app}"
Expand Down
10 changes: 7 additions & 3 deletions 3.9/test/run
Original file line number Diff line number Diff line change
Expand Up @@ -303,19 +303,23 @@ for app in ${@:-${WEB_APPS[@]}}; do
fi

prepare ${app}
if [ $? -ne 0 ]; then
ct_update_test_result "[FAILED]" "${app}" "preparation"
TESTSUITE_RESULT=1
continue
fi
run_s2i_build ${app}
RESULT=$?
msg_run_s2i_build="'${app}' run_s2i_build"
if [[ "$app" == *"-should-fail-"* ]]; then
# Tests with '-should-fail-' in their name should fail during a build, expecting non-zero exit status
check_type $RESULT "negative"
test "$?" == "0" && test_msg="[PASSED]" || test_msg="[FAILED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
continue
else
check_type $RESULT
test "$?" != "0" && test_msg="[FAILED]" || test_msg="[PASSED]"
printf -v test_short_summary "%s %s for %s\n" "${test_short_summary}" "$test_msg" "$msg_run_s2i_build"
ct_update_test_result "$test_msg" "$app" run_s2i_build
fi
echo ""
TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "${app}"
Expand Down

0 comments on commit 2d29a2c

Please # to comment.