YunoHost/package_check
1
0
Fork 0
mirror of https://github.com/YunoHost/package_check.git synced 2024-09-03 20:06:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

More tweak about displaying curl results to avoid displaying it for non-web apps (for which curl_result won't exist..)

Browse source
This commit is contained in:
Alexandre Aubin 2020-12-19 03:31:34 +01:00
parent 242496be86
commit e9aaa408a0
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/tests.sh
View file

@ -255,7 +255,15 @@ Page extract:\n$page_extract" > $TEST_CONTEXT/curl_result
[ "$curl_error" -eq 0 ] || return 1 [ "$curl_error" -eq 0 ] || return 1
local expected_to_fell_on_portal="" local expected_to_fell_on_portal=""
[ "$install_type" == "private" ] && expected_to_fell_on_portal=1 || expected_to_fell_on_portal=0 [ "$install_type" == "private" ] && expected_to_fell_on_portal=1 || expected_to_fell_on_portal=0
[ $fell_on_sso_portal -eq $expected_to_fell_on_portal ] && return 0 || return 0
if [ "$install_type" == "root" ] || [ "$install_type" == "subdir" ] || [ "$install_type" == "upgrade" ];
then
log_info "$(cat $TEST_CONTEXT/curl_result)"
fi
[ $fell_on_sso_portal -eq $expected_to_fell_on_portal ] || return 1
return 0
} }
@ -297,7 +305,6 @@ TEST_INSTALL () {
# Install the application in a LXC container # Install the application in a LXC container
_INSTALL_APP "path=$check_path" "is_public=$is_public" \ _INSTALL_APP "path=$check_path" "is_public=$is_public" \
&& _VALIDATE_THAT_APP_CAN_BE_ACCESSED $SUBDOMAIN $check_path $install_type \ && _VALIDATE_THAT_APP_CAN_BE_ACCESSED $SUBDOMAIN $check_path $install_type \
&& log_info "$(cat $TEST_CONTEXT/curl_result)"
local install=$? local install=$?
@ -379,9 +386,9 @@ TEST_UPGRADE () {
local ret=$? local ret=$?
# Test if the app can be accessed (though we don't want to report an # Test if the app can be accessed (though we don't want to report an
# error if it's not, in that context) # error if it's not, in that context) ... but the point
_VALIDATE_THAT_APP_CAN_BE_ACCESSED "$SUBDOMAIN" "$check_path" \ # is to display the curl page
&& log_info "$(cat $TEST_CONTEXT/curl_result)" _VALIDATE_THAT_APP_CAN_BE_ACCESSED "$SUBDOMAIN" "$check_path" "upgrade"
# Then replace the backup # Then replace the backup
rm -rf "$package_path" rm -rf "$package_path"
@ -395,8 +402,7 @@ TEST_UPGRADE () {
# Upgrade the application in a LXC container # Upgrade the application in a LXC container
_RUN_YUNOHOST_CMD "app upgrade $app_id -f /app_folder" \ _RUN_YUNOHOST_CMD "app upgrade $app_id -f /app_folder" \
&& _VALIDATE_THAT_APP_CAN_BE_ACCESSED $SUBDOMAIN $check_path \ && _VALIDATE_THAT_APP_CAN_BE_ACCESSED $SUBDOMAIN $check_path "upgrade"
&& log_info "$(cat $TEST_CONTEXT/curl_result)"
return $? return $?
} }