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

friskies

Browse source
This commit is contained in:
Alexandre Aubin 2024-07-01 21:39:59 +02:00
parent 92807afb16
commit bc3e36abb3
7 changed files with 258 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
helpers/helpers.v2.1.d/logging
View file

@ -7,7 +7,10 @@ ynh_die() {
set +o xtrace # set +x set +o xtrace # set +x
if [[ -n "${1:-}" ]] if [[ -n "${1:-}" ]]
then then
python3 -c 'import yaml, sys; print(yaml.dump({"error": sys.stdin.read()}))' <<< "${1:-}" >>"$YNH_STDRETURN" if [[ -n "${YNH_STDRETURN:-}" ]]
then
python3 -c 'import yaml, sys; print(yaml.dump({"error": sys.stdin.read()}))' <<< "${1:-}" >>"$YNH_STDRETURN"
fi
echo "${1:-}" 1>&2 echo "${1:-}" 1>&2
fi fi
exit 1 exit 1

6
tests/test_helpers.v2.1.d/ynhtest_apt.sh
View file

@ -1,5 +1,11 @@
ynhtest_apt_install_apt_deps_regular() { ynhtest_apt_install_apt_deps_regular() {
cat << EOF > ../manifest.toml
packaging_format = 2
id = "$app"
version = "0.1~ynh2"
EOF
dpkg --list | grep -q "ii *$app-ynh-deps" && apt remove $app-ynh-deps --assume-yes || true dpkg --list | grep -q "ii *$app-ynh-deps" && apt remove $app-ynh-deps --assume-yes || true
dpkg --list | grep -q 'ii *nyancat' && apt remove nyancat --assume-yes || true dpkg --list | grep -q 'ii *nyancat' && apt remove nyancat --assume-yes || true
dpkg --list | grep -q 'ii *sl' && apt remove sl --assume-yes || true dpkg --list | grep -q 'ii *sl' && apt remove sl --assume-yes || true

486
tests/test_helpers.v2.1.d/ynhtest_config.sh
View file

@ -38,38 +38,38 @@ DICT['ldap_conf']['user'] = "camille"
DICT['TITLE'] = "Hello world" DICT['TITLE'] = "Hello world"
EOF EOF
test "$(_read_py "$file" "FOO")" == "None" test "$(_read_py "$file" "FOO")" == "None"
test "$(ynh_read_var_in_file "$file" "FOO")" == "None" test "$(ynh_read_var_in_file --file="$file" --key="FOO")" == "None"
test "$(_read_py "$file" "ENABLED")" == "False" test "$(_read_py "$file" "ENABLED")" == "False"
test "$(ynh_read_var_in_file "$file" "ENABLED")" == "False" test "$(ynh_read_var_in_file --file="$file" --key="ENABLED")" == "False"
test "$(_read_py "$file" "TITLE")" == "Lorem Ipsum" test "$(_read_py "$file" "TITLE")" == "Lorem Ipsum"
test "$(ynh_read_var_in_file "$file" "TITLE")" == "Lorem Ipsum" test "$(ynh_read_var_in_file --file="$file" --key="TITLE")" == "Lorem Ipsum"
test "$(_read_py "$file" "THEME")" == "colib'ris" test "$(_read_py "$file" "THEME")" == "colib'ris"
test "$(ynh_read_var_in_file "$file" "THEME")" == "colib'ris" test "$(ynh_read_var_in_file --file="$file" --key="THEME")" == "colib'ris"
test "$(_read_py "$file" "EMAIL")" == "root@example.com" test "$(_read_py "$file" "EMAIL")" == "root@example.com"
test "$(ynh_read_var_in_file "$file" "EMAIL")" == "root@example.com" test "$(ynh_read_var_in_file --file="$file" --key="EMAIL")" == "root@example.com"
test "$(_read_py "$file" "PORT")" == "1234" test "$(_read_py "$file" "PORT")" == "1234"
test "$(ynh_read_var_in_file "$file" "PORT")" == "1234" test "$(ynh_read_var_in_file --file="$file" --key="PORT")" == "1234"
test "$(_read_py "$file" "URL")" == "https://yunohost.org" test "$(_read_py "$file" "URL")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "URL")" == "https://yunohost.org" test "$(ynh_read_var_in_file --file="$file" --key="URL")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=users,dc=yunohost,dc=org" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=users,dc=yunohost,dc=org"
test "$(ynh_read_var_in_file "$file" "user")" == "camille" test "$(ynh_read_var_in_file --file="$file" --key="user")" == "camille"
test "$(ynh_read_var_in_file "$file" "TITLE" "YNH_ICI")" == "Hello world" test "$(ynh_read_var_in_file --file="$file" --key="TITLE" --after"YNH_ICI")" == "Hello world"
! _read_py "$file" "NONEXISTENT" ! _read_py "$file" "NONEXISTENT"
test "$(ynh_read_var_in_file "$file" "NONEXISTENT")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="NONEXISTENT")" == "YNH_NULL"
! _read_py "$file" "ENABLE" ! _read_py "$file" "ENABLE"
test "$(ynh_read_var_in_file "$file" "ENABLE")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="ENABLE")" == "YNH_NULL"
} }
ynhtest_config_write_py() { ynhtest_config_write_py() {
@ -92,47 +92,47 @@ DICT['ldap_base'] = "ou=users,dc=yunohost,dc=org"
DICT['TITLE'] = "Hello world" DICT['TITLE'] = "Hello world"
EOF EOF
ynh_write_var_in_file "$file" "FOO" "bar" ynh_write_var_in_file --file="$file" --key="FOO" --value="bar"
test "$(_read_py "$file" "FOO")" == "bar" test "$(_read_py "$file" "FOO")" == "bar"
test "$(ynh_read_var_in_file "$file" "FOO")" == "bar" test "$(ynh_read_var_in_file --file="$file" --key="FOO")" == "bar"
ynh_write_var_in_file "$file" "ENABLED" "True" ynh_write_var_in_file --file="$file" --key="ENABLED" --value="True"
test "$(_read_py "$file" "ENABLED")" == "True" test "$(_read_py "$file" "ENABLED")" == "True"
test "$(ynh_read_var_in_file "$file" "ENABLED")" == "True" test "$(ynh_read_var_in_file --file="$file" --key="ENABLED")" == "True"
ynh_write_var_in_file "$file" "TITLE" "Foo Bar" ynh_write_var_in_file --file="$file" --key="TITLE" --value="Foo Bar"
test "$(_read_py "$file" "TITLE")" == "Foo Bar" test "$(_read_py "$file" "TITLE")" == "Foo Bar"
test "$(ynh_read_var_in_file "$file" "TITLE")" == "Foo Bar" test "$(ynh_read_var_in_file --file="$file" --key="TITLE")" == "Foo Bar"
ynh_write_var_in_file "$file" "THEME" "super-awesome-theme" ynh_write_var_in_file --file="$file" --key="THEME" --value="super-awesome-theme"
test "$(_read_py "$file" "THEME")" == "super-awesome-theme" test "$(_read_py "$file" "THEME")" == "super-awesome-theme"
test "$(ynh_read_var_in_file "$file" "THEME")" == "super-awesome-theme" test "$(ynh_read_var_in_file --file="$file" --key="THEME")" == "super-awesome-theme"
ynh_write_var_in_file "$file" "EMAIL" "sam@domain.tld" ynh_write_var_in_file --file="$file" --key="EMAIL" --value="sam@domain.tld"
test "$(_read_py "$file" "EMAIL")" == "sam@domain.tld" test "$(_read_py "$file" "EMAIL")" == "sam@domain.tld"
test "$(ynh_read_var_in_file "$file" "EMAIL")" == "sam@domain.tld" test "$(ynh_read_var_in_file --file="$file" --key="EMAIL")" == "sam@domain.tld"
ynh_write_var_in_file "$file" "PORT" "5678" ynh_write_var_in_file --file="$file" --key="PORT" --value="5678"
test "$(_read_py "$file" "PORT")" == "5678" test "$(_read_py "$file" "PORT")" == "5678"
test "$(ynh_read_var_in_file "$file" "PORT")" == "5678" test "$(ynh_read_var_in_file --file="$file" --key="PORT")" == "5678"
ynh_write_var_in_file "$file" "URL" "https://domain.tld/foobar" ynh_write_var_in_file --file="$file" --key="URL" --value="https://domain.tld/foobar"
test "$(_read_py "$file" "URL")" == "https://domain.tld/foobar" test "$(_read_py "$file" "URL")" == "https://domain.tld/foobar"
test "$(ynh_read_var_in_file "$file" "URL")" == "https://domain.tld/foobar" test "$(ynh_read_var_in_file --file="$file" --key="URL")" == "https://domain.tld/foobar"
ynh_write_var_in_file "$file" "ldap_base" "ou=users,dc=yunohost,dc=org" ynh_write_var_in_file --file="$file" --key="ldap_base" --value="ou=users,dc=yunohost,dc=org"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=users,dc=yunohost,dc=org" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=users,dc=yunohost,dc=org"
ynh_write_var_in_file "$file" "TITLE" "YOLO" "YNH_ICI" ynh_write_var_in_file --file="$file" --key="TITLE" --value="YOLO" --after"YNH_ICI"
test "$(ynh_read_var_in_file "$file" "TITLE" "YNH_ICI")" == "YOLO" test "$(ynh_read_var_in_file --file="$file" --key="TITLE" --after"YNH_ICI")" == "YOLO"
! ynh_write_var_in_file "$file" "NONEXISTENT" "foobar" ! ynh_write_var_in_file --file="$file" --key="NONEXISTENT" --value="foobar"
! _read_py "$file" "NONEXISTENT" ! _read_py "$file" "NONEXISTENT"
test "$(ynh_read_var_in_file "$file" "NONEXISTENT")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="NONEXISTENT")" == "YNH_NULL"
! ynh_write_var_in_file "$file" "ENABLE" "foobar" ! ynh_write_var_in_file --file="$file" --key="ENABLE" -value="foobar"
! _read_py "$file" "ENABLE" ! _read_py "$file" "ENABLE"
test "$(ynh_read_var_in_file "$file" "ENABLE")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="ENABLE")" == "YNH_NULL"
} }
@ -172,34 +172,34 @@ url = https://yunohost.org
ldap_base = ou=users,dc=yunohost,dc=org ldap_base = ou=users,dc=yunohost,dc=org
EOF EOF
test "$(_read_ini "$file" "foo")" == "null" test "$(_read_ini "$file" "foo")" == "null"
test "$(ynh_read_var_in_file "$file" "foo")" == "null" test "$(ynh_read_var_in_file --file="$file" --key="foo")" == "null"
test "$(_read_ini "$file" "enabled")" == "False" test "$(_read_ini "$file" "enabled")" == "False"
test "$(ynh_read_var_in_file "$file" "enabled")" == "False" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "False"
test "$(_read_ini "$file" "title")" == "Lorem Ipsum" test "$(_read_ini "$file" "title")" == "Lorem Ipsum"
test "$(ynh_read_var_in_file "$file" "title")" == "Lorem Ipsum" test "$(ynh_read_var_in_file --file="$file" --key="title")" == "Lorem Ipsum"
test "$(_read_ini "$file" "theme")" == "colib'ris" test "$(_read_ini "$file" "theme")" == "colib'ris"
test "$(ynh_read_var_in_file "$file" "theme")" == "colib'ris" test "$(ynh_read_var_in_file --file="$file" --key="theme")" == "colib'ris"
#test "$(_read_ini "$file" "email")" == "root@example.com" #test "$(_read_ini "$file" "email")" == "root@example.com"
test "$(ynh_read_var_in_file "$file" "email")" == "root@example.com" test "$(ynh_read_var_in_file --file="$file" --key="email")" == "root@example.com"
#test "$(_read_ini "$file" "port")" == "1234" #test "$(_read_ini "$file" "port")" == "1234"
test "$(ynh_read_var_in_file "$file" "port")" == "1234" test "$(ynh_read_var_in_file --file="$file" --key="port")" == "1234"
test "$(_read_ini "$file" "url")" == "https://yunohost.org" test "$(_read_ini "$file" "url")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "url")" == "https://yunohost.org" test "$(ynh_read_var_in_file --file="$file" --key="url")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=users,dc=yunohost,dc=org" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=users,dc=yunohost,dc=org"
! _read_ini "$file" "nonexistent" ! _read_ini "$file" "nonexistent"
test "$(ynh_read_var_in_file "$file" "nonexistent")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="nonexistent")" == "YNH_NULL"
! _read_ini "$file" "enable" ! _read_ini "$file" "enable"
test "$(ynh_read_var_in_file "$file" "enable")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="enable")" == "YNH_NULL"
} }
@ -223,44 +223,44 @@ url = https://yunohost.org
ldap_base = ou=users,dc=yunohost,dc=org ldap_base = ou=users,dc=yunohost,dc=org
EOF EOF
ynh_write_var_in_file "$file" "foo" "bar" ynh_write_var_in_file --file="$file" --key="foo" --value="bar"
test "$(_read_ini "$file" "foo")" == "bar" test "$(_read_ini "$file" "foo")" == "bar"
test "$(ynh_read_var_in_file "$file" "foo")" == "bar" test "$(ynh_read_var_in_file --file="$file" --key="foo")" == "bar"
ynh_write_var_in_file "$file" "enabled" "True" ynh_write_var_in_file --file="$file" --key="enabled" --value="True"
test "$(_read_ini "$file" "enabled")" == "True" test "$(_read_ini "$file" "enabled")" == "True"
test "$(ynh_read_var_in_file "$file" "enabled")" == "True" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "True"
ynh_write_var_in_file "$file" "title" "Foo Bar" ynh_write_var_in_file --file="$file" --key="title" --value="Foo Bar"
test "$(_read_ini "$file" "title")" == "Foo Bar" test "$(_read_ini "$file" "title")" == "Foo Bar"
test "$(ynh_read_var_in_file "$file" "title")" == "Foo Bar" test "$(ynh_read_var_in_file --file="$file" --key="title")" == "Foo Bar"
ynh_write_var_in_file "$file" "theme" "super-awesome-theme" ynh_write_var_in_file --file="$file" --key="theme" --value="super-awesome-theme"
test "$(_read_ini "$file" "theme")" == "super-awesome-theme" test "$(_read_ini "$file" "theme")" == "super-awesome-theme"
test "$(ynh_read_var_in_file "$file" "theme")" == "super-awesome-theme" test "$(ynh_read_var_in_file --file="$file" --key="theme")" == "super-awesome-theme"
ynh_write_var_in_file "$file" "email" "sam@domain.tld" ynh_write_var_in_file --file="$file" --key="email" --value="sam@domain.tld"
test "$(_read_ini "$file" "email")" == "sam@domain.tld # This is a comment without quotes" test "$(_read_ini "$file" "email")" == "sam@domain.tld # This is a comment without quotes"
test "$(ynh_read_var_in_file "$file" "email")" == "sam@domain.tld" test "$(ynh_read_var_in_file --file="$file" --key="email")" == "sam@domain.tld"
ynh_write_var_in_file "$file" "port" "5678" ynh_write_var_in_file --file="$file" --key="port" --value="5678"
test "$(_read_ini "$file" "port")" == "5678 # This is a comment without quotes" test "$(_read_ini "$file" "port")" == "5678 # This is a comment without quotes"
test "$(ynh_read_var_in_file "$file" "port")" == "5678" test "$(ynh_read_var_in_file --file="$file" --key="port")" == "5678"
ynh_write_var_in_file "$file" "url" "https://domain.tld/foobar" ynh_write_var_in_file --file="$file" --key="url" --value="https://domain.tld/foobar"
test "$(_read_ini "$file" "url")" == "https://domain.tld/foobar" test "$(_read_ini "$file" "url")" == "https://domain.tld/foobar"
test "$(ynh_read_var_in_file "$file" "url")" == "https://domain.tld/foobar" test "$(ynh_read_var_in_file --file="$file" --key="url")" == "https://domain.tld/foobar"
ynh_write_var_in_file "$file" "ldap_base" "ou=users,dc=yunohost,dc=org" ynh_write_var_in_file "$file" "ldap_base" "ou=users,dc=yunohost,dc=org"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=users,dc=yunohost,dc=org" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=users,dc=yunohost,dc=org"
! ynh_write_var_in_file "$file" "nonexistent" "foobar" ! ynh_write_var_in_file --file="$file" --key="nonexistent" "foobar"
! _read_ini "$file" "nonexistent" ! _read_ini "$file" "nonexistent"
test "$(ynh_read_var_in_file "$file" "nonexistent")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="nonexistent")" == "YNH_NULL"
! ynh_write_var_in_file "$file" "enable" "foobar" ! ynh_write_var_in_file --file="$file" --key="enable" "foobar"
! _read_ini "$file" "enable" ! _read_ini "$file" "enable"
test "$(ynh_read_var_in_file "$file" "enable")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="enable")" == "YNH_NULL"
} }
@ -300,34 +300,34 @@ dict:
ldap_base: ou=users,dc=yunohost,dc=org ldap_base: ou=users,dc=yunohost,dc=org
EOF EOF
test "$(_read_yaml "$file" "foo")" == "None" test "$(_read_yaml "$file" "foo")" == "None"
test "$(ynh_read_var_in_file "$file" "foo")" == "" test "$(ynh_read_var_in_file --file="$file" --key="foo")" == ""
test "$(_read_yaml "$file" "enabled")" == "False" test "$(_read_yaml "$file" "enabled")" == "False"
test "$(ynh_read_var_in_file "$file" "enabled")" == "false" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "false"
test "$(_read_yaml "$file" "title")" == "Lorem Ipsum" test "$(_read_yaml "$file" "title")" == "Lorem Ipsum"
test "$(ynh_read_var_in_file "$file" "title")" == "Lorem Ipsum" test "$(ynh_read_var_in_file --file="$file" --key="title")" == "Lorem Ipsum"
test "$(_read_yaml "$file" "theme")" == "colib'ris" test "$(_read_yaml "$file" "theme")" == "colib'ris"
test "$(ynh_read_var_in_file "$file" "theme")" == "colib'ris" test "$(ynh_read_var_in_file --file="$file" --key="theme")" == "colib'ris"
test "$(_read_yaml "$file" "email")" == "root@example.com" test "$(_read_yaml "$file" "email")" == "root@example.com"
test "$(ynh_read_var_in_file "$file" "email")" == "root@example.com" test "$(ynh_read_var_in_file --file="$file" --key="email")" == "root@example.com"
test "$(_read_yaml "$file" "port")" == "1234" test "$(_read_yaml "$file" "port")" == "1234"
test "$(ynh_read_var_in_file "$file" "port")" == "1234" test "$(ynh_read_var_in_file --file="$file" --key="port")" == "1234"
test "$(_read_yaml "$file" "url")" == "https://yunohost.org" test "$(_read_yaml "$file" "url")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "url")" == "https://yunohost.org" test "$(ynh_read_var_in_file --file="$file" --key="url")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=users,dc=yunohost,dc=org" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=users,dc=yunohost,dc=org"
! _read_yaml "$file" "nonexistent" ! _read_yaml "$file" "nonexistent"
test "$(ynh_read_var_in_file "$file" "nonexistent")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="nonexistent")" == "YNH_NULL"
! _read_yaml "$file" "enable" ! _read_yaml "$file" "enable"
test "$(ynh_read_var_in_file "$file" "enable")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="enable")" == "YNH_NULL"
} }
@ -349,44 +349,44 @@ dict:
ldap_base: ou=users,dc=yunohost,dc=org ldap_base: ou=users,dc=yunohost,dc=org
EOF EOF
ynh_write_var_in_file "$file" "foo" "bar" ynh_write_var_in_file --file="$file" --key="foo" --value="bar"
# cat $dummy_dir/dummy.yml # to debug # cat $dummy_dir/dummy.yml # to debug
! test "$(_read_yaml "$file" "foo")" == "bar" # writing broke the yaml syntax... "foo:bar" (no space aftr :) ! test "$(_read_yaml "$file" "foo")" == "bar" # writing broke the yaml syntax... "foo:bar" (no space aftr :)
test "$(ynh_read_var_in_file "$file" "foo")" == "bar" test "$(ynh_read_var_in_file --file="$file" --key="foo")" == "bar"
ynh_write_var_in_file "$file" "enabled" "true" ynh_write_var_in_file --file="$file" --key="enabled" --value="true"
test "$(_read_yaml "$file" "enabled")" == "True" test "$(_read_yaml "$file" "enabled")" == "True"
test "$(ynh_read_var_in_file "$file" "enabled")" == "true" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "true"
ynh_write_var_in_file "$file" "title" "Foo Bar" ynh_write_var_in_file --file="$file" --key="title" --value="Foo Bar"
test "$(_read_yaml "$file" "title")" == "Foo Bar" test "$(_read_yaml "$file" "title")" == "Foo Bar"
test "$(ynh_read_var_in_file "$file" "title")" == "Foo Bar" test "$(ynh_read_var_in_file --file="$file" --key="title")" == "Foo Bar"
ynh_write_var_in_file "$file" "theme" "super-awesome-theme" ynh_write_var_in_file --file="$file" --key="theme" --value="super-awesome-theme"
test "$(_read_yaml "$file" "theme")" == "super-awesome-theme" test "$(_read_yaml "$file" "theme")" == "super-awesome-theme"
test "$(ynh_read_var_in_file "$file" "theme")" == "super-awesome-theme" test "$(ynh_read_var_in_file --file="$file" --key="theme")" == "super-awesome-theme"
ynh_write_var_in_file "$file" "email" "sam@domain.tld" ynh_write_var_in_file --file="$file" --key="email" --value="sam@domain.tld"
test "$(_read_yaml "$file" "email")" == "sam@domain.tld" test "$(_read_yaml "$file" "email")" == "sam@domain.tld"
test "$(ynh_read_var_in_file "$file" "email")" == "sam@domain.tld" test "$(ynh_read_var_in_file --file="$file" --key="email")" == "sam@domain.tld"
ynh_write_var_in_file "$file" "port" "5678" ynh_write_var_in_file --file="$file" --key="port" --value="5678"
test "$(_read_yaml "$file" "port")" == "5678" test "$(_read_yaml "$file" "port")" == "5678"
test "$(ynh_read_var_in_file "$file" "port")" == "5678" test "$(ynh_read_var_in_file --file="$file" --key="port")" == "5678"
ynh_write_var_in_file "$file" "url" "https://domain.tld/foobar" ynh_write_var_in_file --file="$file" --key="url" --value="https://domain.tld/foobar"
test "$(_read_yaml "$file" "url")" == "https://domain.tld/foobar" test "$(_read_yaml "$file" "url")" == "https://domain.tld/foobar"
test "$(ynh_read_var_in_file "$file" "url")" == "https://domain.tld/foobar" test "$(ynh_read_var_in_file --file="$file" --key="url")" == "https://domain.tld/foobar"
ynh_write_var_in_file "$file" "ldap_base" "ou=foobar,dc=domain,dc=tld" ynh_write_var_in_file --file="$file" --key="ldap_base" --value="ou=foobar,dc=domain,dc=tld"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=foobar,dc=domain,dc=tld" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=foobar,dc=domain,dc=tld"
! ynh_write_var_in_file "$file" "nonexistent" "foobar" ! ynh_write_var_in_file --file="$file" --key="nonexistent" --value="foobar"
test "$(ynh_read_var_in_file "$file" "nonexistent")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="nonexistent")" == "YNH_NULL"
! ynh_write_var_in_file "$file" "enable" "foobar" ! ynh_write_var_in_file --file="$file" --key="enable" --value="foobar"
test "$(ynh_read_var_in_file "$file" "enable")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="enable")" == "YNH_NULL"
test "$(ynh_read_var_in_file "$file" "enabled")" == "true" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "true"
} }
######################### #########################
@ -427,34 +427,34 @@ ynhtest_config_read_json() {
EOF EOF
test "$(_read_json "$file" "foo")" == "None" test "$(_read_json "$file" "foo")" == "None"
test "$(ynh_read_var_in_file "$file" "foo")" == "null" test "$(ynh_read_var_in_file --file="$file" --key="foo")" == "null"
test "$(_read_json "$file" "enabled")" == "False" test "$(_read_json "$file" "enabled")" == "False"
test "$(ynh_read_var_in_file "$file" "enabled")" == "false" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "false"
test "$(_read_json "$file" "title")" == "Lorem Ipsum" test "$(_read_json "$file" "title")" == "Lorem Ipsum"
test "$(ynh_read_var_in_file "$file" "title")" == "Lorem Ipsum" test "$(ynh_read_var_in_file --file="$file" --key="title")" == "Lorem Ipsum"
test "$(_read_json "$file" "theme")" == "colib'ris" test "$(_read_json "$file" "theme")" == "colib'ris"
test "$(ynh_read_var_in_file "$file" "theme")" == "colib'ris" test "$(ynh_read_var_in_file --file="$file" --key="theme")" == "colib'ris"
test "$(_read_json "$file" "email")" == "root@example.com" test "$(_read_json "$file" "email")" == "root@example.com"
test "$(ynh_read_var_in_file "$file" "email")" == "root@example.com" test "$(ynh_read_var_in_file --file="$file" --key="email")" == "root@example.com"
test "$(_read_json "$file" "port")" == "1234" test "$(_read_json "$file" "port")" == "1234"
test "$(ynh_read_var_in_file "$file" "port")" == "1234" test "$(ynh_read_var_in_file --file="$file" --key="port")" == "1234"
test "$(_read_json "$file" "url")" == "https://yunohost.org" test "$(_read_json "$file" "url")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "url")" == "https://yunohost.org" test "$(ynh_read_var_in_file --file="$file" --key="url")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=users,dc=yunohost,dc=org" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=users,dc=yunohost,dc=org"
! _read_json "$file" "nonexistent" ! _read_json "$file" "nonexistent"
test "$(ynh_read_var_in_file "$file" "nonexistent")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="nonexistent")" == "YNH_NULL"
! _read_json "$file" "enable" ! _read_json "$file" "enable"
test "$(ynh_read_var_in_file "$file" "enable")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="enable")" == "YNH_NULL"
} }
@ -477,48 +477,48 @@ ynhtest_config_write_json() {
} }
EOF EOF
ynh_write_var_in_file "$file" "foo" "bar" ynh_write_var_in_file --file="$file" --key="foo" --value="bar"
cat $file cat $file
test "$(_read_json "$file" "foo")" == "bar" test "$(_read_json "$file" "foo")" == "bar"
test "$(ynh_read_var_in_file "$file" "foo")" == "bar" test "$(ynh_read_var_in_file --file="$file" --key="foo")" == "bar"
ynh_write_var_in_file "$file" "enabled" "true" ynh_write_var_in_file --file="$file" --key="enabled" --value="true"
cat $file cat $file
test "$(_read_json "$file" "enabled")" == "true" test "$(_read_json "$file" "enabled")" == "true"
test "$(ynh_read_var_in_file "$file" "enabled")" == "true" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "true"
ynh_write_var_in_file "$file" "title" "Foo Bar" ynh_write_var_in_file --file="$file" --key="title" --value="Foo Bar"
cat $file cat $file
test "$(_read_json "$file" "title")" == "Foo Bar" test "$(_read_json "$file" "title")" == "Foo Bar"
test "$(ynh_read_var_in_file "$file" "title")" == "Foo Bar" test "$(ynh_read_var_in_file --file="$file" --key="title")" == "Foo Bar"
ynh_write_var_in_file "$file" "theme" "super-awesome-theme" ynh_write_var_in_file --file="$file" --key="theme" --value="super-awesome-theme"
cat $file cat $file
test "$(_read_json "$file" "theme")" == "super-awesome-theme" test "$(_read_json "$file" "theme")" == "super-awesome-theme"
test "$(ynh_read_var_in_file "$file" "theme")" == "super-awesome-theme" test "$(ynh_read_var_in_file --file="$file" --key="theme")" == "super-awesome-theme"
ynh_write_var_in_file "$file" "email" "sam@domain.tld" ynh_write_var_in_file --file="$file" --key="email" --value="sam@domain.tld"
cat $file cat $file
test "$(_read_json "$file" "email")" == "sam@domain.tld" test "$(_read_json "$file" "email")" == "sam@domain.tld"
test "$(ynh_read_var_in_file "$file" "email")" == "sam@domain.tld" test "$(ynh_read_var_in_file --file="$file" --key="email")" == "sam@domain.tld"
ynh_write_var_in_file "$file" "port" "5678" ynh_write_var_in_file --file="$file" --key="port" --value="5678"
test "$(_read_json "$file" "port")" == "5678" test "$(_read_json "$file" "port")" == "5678"
test "$(ynh_read_var_in_file "$file" "port")" == "5678" test "$(ynh_read_var_in_file --file="$file" --key="port")" == "5678"
ynh_write_var_in_file "$file" "url" "https://domain.tld/foobar" ynh_write_var_in_file --file="$file" --key="url" --value="https://domain.tld/foobar"
test "$(_read_json "$file" "url")" == "https://domain.tld/foobar" test "$(_read_json "$file" "url")" == "https://domain.tld/foobar"
test "$(ynh_read_var_in_file "$file" "url")" == "https://domain.tld/foobar" test "$(ynh_read_var_in_file --file="$file" --key="url")" == "https://domain.tld/foobar"
ynh_write_var_in_file "$file" "ldap_base" "ou=foobar,dc=domain,dc=tld" ynh_write_var_in_file --file="$file" --key="ldap_base" --value="ou=foobar,dc=domain,dc=tld"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=foobar,dc=domain,dc=tld" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=foobar,dc=domain,dc=tld"
! ynh_write_var_in_file "$file" "nonexistent" "foobar" ! ynh_write_var_in_file --file="$file" --key="nonexistent" --value="foobar"
test "$(ynh_read_var_in_file "$file" "nonexistent")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="nonexistent")" == "YNH_NULL"
! ynh_write_var_in_file "$file" "enable" "foobar" ! ynh_write_var_in_file --file="$file" --key="enable" --value="foobar"
test "$(ynh_read_var_in_file "$file" "enable")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="enable")" == "YNH_NULL"
test "$(ynh_read_var_in_file "$file" "enabled")" == "true" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "true"
} }
####################### #######################
@ -563,38 +563,38 @@ ynhtest_config_read_php() {
?> ?>
EOF EOF
test "$(_read_php "$file" "foo")" == "NULL" test "$(_read_php "$file" "foo")" == "NULL"
test "$(ynh_read_var_in_file "$file" "foo")" == "NULL" test "$(ynh_read_var_in_file --file="$file" --key="foo")" == "NULL"
test "$(_read_php "$file" "enabled")" == "false" test "$(_read_php "$file" "enabled")" == "false"
test "$(ynh_read_var_in_file "$file" "enabled")" == "false" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "false"
test "$(_read_php "$file" "title")" == "Lorem Ipsum" test "$(_read_php "$file" "title")" == "Lorem Ipsum"
test "$(ynh_read_var_in_file "$file" "title")" == "Lorem Ipsum" test "$(ynh_read_var_in_file --file="$file" --key="title")" == "Lorem Ipsum"
test "$(_read_php "$file" "theme")" == "colib\\'ris" test "$(_read_php "$file" "theme")" == "colib\\'ris"
test "$(ynh_read_var_in_file "$file" "theme")" == "colib'ris" test "$(ynh_read_var_in_file --file="$file" --key="theme")" == "colib'ris"
test "$(_read_php "$file" "email")" == "root@example.com" test "$(_read_php "$file" "email")" == "root@example.com"
test "$(ynh_read_var_in_file "$file" "email")" == "root@example.com" test "$(ynh_read_var_in_file --file="$file" --key="email")" == "root@example.com"
test "$(_read_php "$file" "port")" == "1234" test "$(_read_php "$file" "port")" == "1234"
test "$(ynh_read_var_in_file "$file" "port")" == "1234" test "$(ynh_read_var_in_file --file="$file" --key="port")" == "1234"
test "$(_read_php "$file" "url")" == "https://yunohost.org" test "$(_read_php "$file" "url")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "url")" == "https://yunohost.org" test "$(ynh_read_var_in_file --file="$file" --key="url")" == "https://yunohost.org"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=users,dc=yunohost,dc=org" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=users,dc=yunohost,dc=org"
test "$(ynh_read_var_in_file "$file" "user")" == "camille" test "$(ynh_read_var_in_file --file="$file" --key="user")" == "camille"
test "$(ynh_read_var_in_file "$file" "DB_HOST")" == "localhost" test "$(ynh_read_var_in_file --file="$file" --key="DB_HOST")" == "localhost"
! _read_php "$file" "nonexistent" ! _read_php "$file" "nonexistent"
test "$(ynh_read_var_in_file "$file" "nonexistent")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="nonexistent")" == "YNH_NULL"
! _read_php "$file" "enable" ! _read_php "$file" "enable"
test "$(ynh_read_var_in_file "$file" "enable")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="enable")" == "YNH_NULL"
} }
@ -619,44 +619,44 @@ ynhtest_config_write_php() {
?> ?>
EOF EOF
ynh_write_var_in_file "$file" "foo" "bar" ynh_write_var_in_file --file="$file" --key="foo" --value="bar"
test "$(_read_php "$file" "foo")" == "bar" test "$(_read_php "$file" "foo")" == "bar"
test "$(ynh_read_var_in_file "$file" "foo")" == "bar" test "$(ynh_read_var_in_file --file="$file" --key="foo")" == "bar"
ynh_write_var_in_file "$file" "enabled" "true" ynh_write_var_in_file --file="$file" --key="enabled" --value="true"
test "$(_read_php "$file" "enabled")" == "true" test "$(_read_php "$file" "enabled")" == "true"
test "$(ynh_read_var_in_file "$file" "enabled")" == "true" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "true"
ynh_write_var_in_file "$file" "title" "Foo Bar" ynh_write_var_in_file --file="$file" --key="title" --value="Foo Bar"
cat $file cat $file
test "$(_read_php "$file" "title")" == "Foo Bar" test "$(_read_php "$file" "title")" == "Foo Bar"
test "$(ynh_read_var_in_file "$file" "title")" == "Foo Bar" test "$(ynh_read_var_in_file --file="$file" --key="title")" == "Foo Bar"
ynh_write_var_in_file "$file" "theme" "super-awesome-theme" ynh_write_var_in_file --file="$file" --key="theme" --value="super-awesome-theme"
cat $file cat $file
test "$(_read_php "$file" "theme")" == "super-awesome-theme" test "$(_read_php "$file" "theme")" == "super-awesome-theme"
test "$(ynh_read_var_in_file "$file" "theme")" == "super-awesome-theme" test "$(ynh_read_var_in_file --file="$file" --key="theme")" == "super-awesome-theme"
ynh_write_var_in_file "$file" "email" "sam@domain.tld" ynh_write_var_in_file --file="$file" --key="email" --value="sam@domain.tld"
cat $file cat $file
test "$(_read_php "$file" "email")" == "sam@domain.tld" test "$(_read_php "$file" "email")" == "sam@domain.tld"
test "$(ynh_read_var_in_file "$file" "email")" == "sam@domain.tld" test "$(ynh_read_var_in_file --file="$file" --key="email")" == "sam@domain.tld"
ynh_write_var_in_file "$file" "port" "5678" ynh_write_var_in_file --file="$file" --key="port" --value="5678"
test "$(_read_php "$file" "port")" == "5678" test "$(_read_php "$file" "port")" == "5678"
test "$(ynh_read_var_in_file "$file" "port")" == "5678" test "$(ynh_read_var_in_file --file="$file" --key="port")" == "5678"
ynh_write_var_in_file "$file" "url" "https://domain.tld/foobar" ynh_write_var_in_file --file="$file" --key="url" --value="https://domain.tld/foobar"
test "$(_read_php "$file" "url")" == "https://domain.tld/foobar" test "$(_read_php "$file" "url")" == "https://domain.tld/foobar"
test "$(ynh_read_var_in_file "$file" "url")" == "https://domain.tld/foobar" test "$(ynh_read_var_in_file --file="$file" --key="url")" == "https://domain.tld/foobar"
ynh_write_var_in_file "$file" "ldap_base" "ou=foobar,dc=domain,dc=tld" ynh_write_var_in_file --file="$file" --key="ldap_base" --value="ou=foobar,dc=domain,dc=tld"
test "$(ynh_read_var_in_file "$file" "ldap_base")" == "ou=foobar,dc=domain,dc=tld" test "$(ynh_read_var_in_file --file="$file" --key="ldap_base")" == "ou=foobar,dc=domain,dc=tld"
! ynh_write_var_in_file "$file" "nonexistent" "foobar" ! ynh_write_var_in_file --file="$file" --key="nonexistent" --value="foobar"
test "$(ynh_read_var_in_file "$file" "nonexistent")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="nonexistent")" == "YNH_NULL"
! ynh_write_var_in_file "$file" "enable" "foobar" ! ynh_write_var_in_file --file="$file" --key="enable" --value="foobar"
test "$(ynh_read_var_in_file "$file" "enable")" == "YNH_NULL" test "$(ynh_read_var_in_file --file="$file" --key="enable")" == "YNH_NULL"
test "$(ynh_read_var_in_file "$file" "enabled")" == "true" test "$(ynh_read_var_in_file --file="$file" --key="enabled")" == "true"
} }

45
tests/test_helpers.v2.1.d/ynhtest_logging.sh
View file

@ -45,48 +45,7 @@ ynhtest_exec_warn_less() {
test -e "$FOOANDBAR" test -e "$FOOANDBAR"
rm "$FOOANDBAR" rm "$FOOANDBAR"
###########################
# Legacy stuff using eval #
###########################
test ! -e $FOO test ! -e $FOO
ynh_hide_warnings "touch $FOO" ! ynh_hide_warnings "touch $FOO"
test -e $FOO ! test -e $FOO
rm $FOO
test ! -e $FOO1QUOTEBAR
ynh_hide_warnings "touch \"$FOO1QUOTEBAR\""
# (this works but expliciy *double* quotes have to be provided)
test -e $FOO1QUOTEBAR
rm $FOO1QUOTEBAR
#test ! -e $FOO2QUOTEBAR
#ynh_hide_warnings "touch \'$FOO2QUOTEBAR\'"
## (this doesn't work with simple or double quotes)
#test -e $FOO2QUOTEBAR
#rm $FOO2QUOTEBAR
test ! -e $BAR
ynh_hide_warnings 'touch $BAR'
# That one works because $BAR is only interpreted during eval
test -e $BAR
rm $BAR
#test ! -e $BAR
#ynh_hide_warnings "touch $BAR"
# That one doesn't work because $bar gets interpreted as empty var by eval...
#test -e $BAR
#rm $BAR
test ! -e "$FOOBAR"
ynh_hide_warnings "touch \"$FOOBAR\""
# (works but requires explicit double quotes otherwise eval would interpret 'foo bar' as two separate args..)
test -e "$FOOBAR"
rm "$FOOBAR"
test ! -e "$FOOANDBAR"
ynh_hide_warnings "touch \"$FOOANDBAR\""
# (works but requires explicit double quotes otherwise eval would interpret '&' as a "run command in background" and also bar is not a valid command)
test -e "$FOOANDBAR"
rm "$FOOANDBAR"
} }

5
tests/test_helpers.v2.1.d/ynhtest_settings.sh
View file

@ -7,23 +7,18 @@ ynhtest_settings() {
test -z "$(ynh_app_setting_get --key="foo")" test -z "$(ynh_app_setting_get --key="foo")"
test -z "$(ynh_app_setting_get --key="bar")" test -z "$(ynh_app_setting_get --key="bar")"
test -z "$(ynh_app_setting_get --app="$app" --key="baz")"
ynh_app_setting_set --key="foo" --value="foovalue" ynh_app_setting_set --key="foo" --value="foovalue"
ynh_app_setting_set --app="$app" --key="bar" --value="barvalue" ynh_app_setting_set --app="$app" --key="bar" --value="barvalue"
ynh_app_setting_set "$app" baz bazvalue
test "$(ynh_app_setting_get --key="foo")" == "foovalue" test "$(ynh_app_setting_get --key="foo")" == "foovalue"
test "$(ynh_app_setting_get --key="bar")" == "barvalue" test "$(ynh_app_setting_get --key="bar")" == "barvalue"
test "$(ynh_app_setting_get --app="$app" --key="baz")" == "bazvalue"
ynh_app_setting_delete --key="foo" ynh_app_setting_delete --key="foo"
ynh_app_setting_delete --app="$app" --key="bar" ynh_app_setting_delete --app="$app" --key="bar"
ynh_app_setting_delete "$app" baz
test -z "$(ynh_app_setting_get --key="foo")" test -z "$(ynh_app_setting_get --key="foo")"
test -z "$(ynh_app_setting_get --key="bar")" test -z "$(ynh_app_setting_get --key="bar")"
test -z "$(ynh_app_setting_get --app="$app" --key="baz")"
rm -rf "/etc/yunohost/apps/$app" rm -rf "/etc/yunohost/apps/$app"
} }

3
tests/test_helpers.v2.1.d/ynhtest_setup_source.sh
View file

@ -16,7 +16,7 @@ _make_dummy_manifest() {
cat << EOF cat << EOF
packaging_format = 2 packaging_format = 2
id = "helloworld" id = "$app"
version = "0.1~ynh2" version = "0.1~ynh2"
[resources] [resources]
@ -33,6 +33,7 @@ EOF
ynhtest_setup_source_nominal() { ynhtest_setup_source_nominal() {
install_dir="$(mktemp -d -p $VAR_WWW)" install_dir="$(mktemp -d -p $VAR_WWW)"
_make_dummy_manifest > ../manifest.toml _make_dummy_manifest > ../manifest.toml
cat ../manifest.toml # debug
ynh_setup_source --dest_dir="$install_dir" --source_id="dummy" ynh_setup_source --dest_dir="$install_dir" --source_id="dummy"

1
tests/test_helpers.v2.1.d/ynhtest_templating.sh
View file

@ -10,6 +10,7 @@ foo=__FOO__
EOF EOF
foo="bar" foo="bar"
install_dir="$VAR_WWW"
ynh_config_add --template="$template" --destination="$VAR_WWW/config.txt" ynh_config_add --template="$template" --destination="$VAR_WWW/config.txt"