Fix return of test_ini_config & test_meta_config
Convert test_ini_config to use the "passed / failed" functions in unittest.sh. test_meta_config wraps everything into a function; it's not work unrolling this so just make sure it exits with non-zero if a test fails. Change-Id: I9e9883fdad42358255383eede9121b1d361799c8
This commit is contained in:
Ian Wienand
parent
f56348bcb2
commit
fcdca05de5
|
|
@ -7,6 +7,9 @@ TOP=$(cd $(dirname "$0")/.. && pwd)
|
|||
# Import config functions
|
||||
source $TOP/inc/ini-config
|
||||
|
||||
source $TOP/tests/unittest.sh
|
||||
|
||||
set -e
|
||||
|
||||
echo "Testing INI functions"
|
||||
|
||||
|
|
@ -70,86 +73,86 @@ echo -n "iniset: test missing attribute argument: "
|
|||
iniset test.ini aaa
|
||||
NO_ATTRIBUTE=$(cat test.ini)
|
||||
if [[ "$BEFORE" == "$NO_ATTRIBUTE" ]]; then
|
||||
echo "OK"
|
||||
passed
|
||||
else
|
||||
echo "failed"
|
||||
failed "failed"
|
||||
fi
|
||||
|
||||
echo -n "iniset: test missing section argument: "
|
||||
iniset test.ini
|
||||
NO_SECTION=$(cat test.ini)
|
||||
if [[ "$BEFORE" == "$NO_SECTION" ]]; then
|
||||
echo "OK"
|
||||
passed
|
||||
else
|
||||
echo "failed"
|
||||
failed "failed"
|
||||
fi
|
||||
|
||||
# Test with spaces
|
||||
|
||||
VAL=$(iniget test.ini aaa handlers)
|
||||
if [[ "$VAL" == "aa, bb" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
iniset test.ini aaa handlers "11, 22"
|
||||
|
||||
VAL=$(iniget test.ini aaa handlers)
|
||||
if [[ "$VAL" == "11, 22" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test with spaces in section header
|
||||
|
||||
VAL=$(iniget test.ini " ccc " spaces)
|
||||
if [[ "$VAL" == "yes" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
iniset test.ini "b b" opt_ion 42
|
||||
|
||||
VAL=$(iniget test.ini "b b" opt_ion)
|
||||
if [[ "$VAL" == "42" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test without spaces, end of file
|
||||
|
||||
VAL=$(iniget test.ini bbb handlers)
|
||||
if [[ "$VAL" == "ee,ff" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
iniset test.ini bbb handlers "33,44"
|
||||
|
||||
VAL=$(iniget test.ini bbb handlers)
|
||||
if [[ "$VAL" == "33,44" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
# test empty option
|
||||
if ini_has_option test.ini ddd empty; then
|
||||
echo "OK: ddd.empty present"
|
||||
passed "OK: ddd.empty present"
|
||||
else
|
||||
echo "ini_has_option failed: ddd.empty not found"
|
||||
failed "ini_has_option failed: ddd.empty not found"
|
||||
fi
|
||||
|
||||
# test non-empty option
|
||||
if ini_has_option test.ini bbb handlers; then
|
||||
echo "OK: bbb.handlers present"
|
||||
passed "OK: bbb.handlers present"
|
||||
else
|
||||
echo "ini_has_option failed: bbb.handlers not found"
|
||||
failed "ini_has_option failed: bbb.handlers not found"
|
||||
fi
|
||||
|
||||
# test changing empty option
|
||||
|
|
@ -157,9 +160,9 @@ iniset test.ini ddd empty "42"
|
|||
|
||||
VAL=$(iniget test.ini ddd empty)
|
||||
if [[ "$VAL" == "42" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
# test pipe in option
|
||||
|
|
@ -167,9 +170,9 @@ iniset test.ini aaa handlers "a|b"
|
|||
|
||||
VAL=$(iniget test.ini aaa handlers)
|
||||
if [[ "$VAL" == "a|b" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
# test space in option
|
||||
|
|
@ -177,51 +180,51 @@ iniset test.ini aaa handlers "a b"
|
|||
|
||||
VAL="$(iniget test.ini aaa handlers)"
|
||||
if [[ "$VAL" == "a b" ]]; then
|
||||
echo "OK: $VAL"
|
||||
passed "OK: $VAL"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test section not exist
|
||||
|
||||
VAL=$(iniget test.ini zzz handlers)
|
||||
if [[ -z "$VAL" ]]; then
|
||||
echo "OK: zzz not present"
|
||||
passed "OK: zzz not present"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
iniset test.ini zzz handlers "999"
|
||||
|
||||
VAL=$(iniget test.ini zzz handlers)
|
||||
if [[ -n "$VAL" ]]; then
|
||||
echo "OK: zzz not present"
|
||||
passed "OK: zzz not present"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test option not exist
|
||||
|
||||
VAL=$(iniget test.ini aaa debug)
|
||||
if [[ -z "$VAL" ]]; then
|
||||
echo "OK aaa.debug not present"
|
||||
passed "OK aaa.debug not present"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
if ! ini_has_option test.ini aaa debug; then
|
||||
echo "OK aaa.debug not present"
|
||||
passed "OK aaa.debug not present"
|
||||
else
|
||||
echo "ini_has_option failed: aaa.debug"
|
||||
failed "ini_has_option failed: aaa.debug"
|
||||
fi
|
||||
|
||||
iniset test.ini aaa debug "999"
|
||||
|
||||
VAL=$(iniget test.ini aaa debug)
|
||||
if [[ -n "$VAL" ]]; then
|
||||
echo "OK aaa.debug present"
|
||||
passed "OK aaa.debug present"
|
||||
else
|
||||
echo "iniget failed: $VAL"
|
||||
failed "iniget failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test comments
|
||||
|
|
@ -230,9 +233,9 @@ inicomment test.ini aaa handlers
|
|||
|
||||
VAL=$(iniget test.ini aaa handlers)
|
||||
if [[ -z "$VAL" ]]; then
|
||||
echo "OK"
|
||||
passed "OK"
|
||||
else
|
||||
echo "inicomment failed: $VAL"
|
||||
failed "inicomment failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test multiple line iniset/iniget
|
||||
|
|
@ -242,25 +245,25 @@ VAL=$(iniget_multiline test.ini eee multi)
|
|||
if [[ "$VAL" == "bar1 bar2" ]]; then
|
||||
echo "OK: iniset_multiline"
|
||||
else
|
||||
echo "iniset_multiline failed: $VAL"
|
||||
failed "iniset_multiline failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test iniadd with exiting values
|
||||
iniadd test.ini eee multi bar3
|
||||
VAL=$(iniget_multiline test.ini eee multi)
|
||||
if [[ "$VAL" == "bar1 bar2 bar3" ]]; then
|
||||
echo "OK: iniadd"
|
||||
passed "OK: iniadd"
|
||||
else
|
||||
echo "iniadd failed: $VAL"
|
||||
failed "iniadd failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test iniadd with non-exiting values
|
||||
iniadd test.ini eee non-multi foobar1 foobar2
|
||||
VAL=$(iniget_multiline test.ini eee non-multi)
|
||||
if [[ "$VAL" == "foobar1 foobar2" ]]; then
|
||||
echo "OK: iniadd with non-exiting value"
|
||||
passed "OK: iniadd with non-exiting value"
|
||||
else
|
||||
echo "iniadd with non-exsting failed: $VAL"
|
||||
failed "iniadd with non-exsting failed: $VAL"
|
||||
fi
|
||||
|
||||
# Test inidelete
|
||||
|
|
@ -276,20 +279,22 @@ for x in $del_cases; do
|
|||
inidelete test.ini $x a
|
||||
VAL=$(iniget_multiline test.ini $x a)
|
||||
if [ -z "$VAL" ]; then
|
||||
echo "OK: inidelete $x"
|
||||
passed "OK: inidelete $x"
|
||||
else
|
||||
echo "inidelete $x failed: $VAL"
|
||||
failed "inidelete $x failed: $VAL"
|
||||
fi
|
||||
if [ "$x" = "del_separate_options" -o \
|
||||
"$x" = "del_missing_option" -o \
|
||||
"$x" = "del_missing_option_multi" ]; then
|
||||
VAL=$(iniget_multiline test.ini $x b)
|
||||
if [ "$VAL" = "c" -o "$VAL" = "c d" ]; then
|
||||
echo "OK: inidelete other_options $x"
|
||||
passed "OK: inidelete other_options $x"
|
||||
else
|
||||
echo "inidelete other_option $x failed: $VAL"
|
||||
failed "inidelete other_option $x failed: $VAL"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
rm test.ini
|
||||
|
||||
report_results
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ function check_result {
|
|||
echo "OK"
|
||||
else
|
||||
echo -e "failed: $actual != $expected\n"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue