From: Felix Fietkau Date: Fri, 4 Sep 2009 22:45:12 +0000 (+0200) Subject: test: do not print expected error messages X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=31a900e940fa2662b5c8b736a127fa8785e1381e;p=uci.git test: do not print expected error messages --- diff --git a/test/tests.d/020_get b/test/tests.d/020_get index 7c365f3..ad19264 100644 --- a/test/tests.d/020_get +++ b/test/tests.d/020_get @@ -2,26 +2,26 @@ test_get_parsing() { cp ${REF_DIR}/get_parsing.data ${CONFIG_DIR}/test - assertFailWithNoReturn "${UCI} get test." - assertFailWithNoReturn "${UCI} get test.section." - assertFailWithNoReturn "${UCI} get test.section.opt." - assertFailWithNoReturn "${UCI} get test.section.opt.val." - assertFailWithNoReturn "${UCI} get test.section.opt.val.qsdf.qsd" - assertFailWithNoReturn "${UCI} get test.section.opt.valqsqsd" + assertFailWithNoReturn "${UCI_Q} get test." + assertFailWithNoReturn "${UCI_Q} get test.section." + assertFailWithNoReturn "${UCI_Q} get test.section.opt." + assertFailWithNoReturn "${UCI_Q} get test.section.opt.val." + assertFailWithNoReturn "${UCI_Q} get test.section.opt.val.qsdf.qsd" + assertFailWithNoReturn "${UCI_Q} get test.section.opt.valqsqsd" } test_get_section_index_parsing() { cp ${REF_DIR}/get_parsing.data ${CONFIG_DIR}/test - assertFailWithNoReturn "${UCI} get test.@" - assertFailWithNoReturn "${UCI} get test.@zer." - assertFailWithNoReturn "${UCI} get test.@." - assertFailWithNoReturn "${UCI} get test.@zer[1]" - assertFailWithNoReturn "${UCI} get test.@.opt" - assertFailWithNoReturn "${UCI} get test.@[28]" - assertFailWithNoReturn "${UCI} get test.@[1]." - assertFailWithNoReturn "${UCI} get test.@[1].val." + assertFailWithNoReturn "${UCI_Q} get test.@" + assertFailWithNoReturn "${UCI_Q} get test.@zer." + assertFailWithNoReturn "${UCI_Q} get test.@." + assertFailWithNoReturn "${UCI_Q} get test.@zer[1]" + assertFailWithNoReturn "${UCI_Q} get test.@.opt" + assertFailWithNoReturn "${UCI_Q} get test.@[28]" + assertFailWithNoReturn "${UCI_Q} get test.@[1]." + assertFailWithNoReturn "${UCI_Q} get test.@[1].val." } test_get_option() diff --git a/test/tests.d/030_set b/test/tests.d/030_set index 137a955..9d2ff4b 100644 --- a/test/tests.d/030_set +++ b/test/tests.d/030_set @@ -2,10 +2,10 @@ test_set_parsing() { cp ${REF_DIR}/set_parsing.data ${CONFIG_DIR}/test - assertFailWithNoReturn "${UCI} set test.=val" - assertFailWithNoReturn "${UCI} set test.section.=val" - assertFailWithNoReturn "${UCI} set test.section.opt.=val" - assertFailWithNoReturn "${UCI} set test.section.opt.zflk=val" + assertFailWithNoReturn "${UCI_Q} set test.=val" + assertFailWithNoReturn "${UCI_Q} set test.section.=val" + assertFailWithNoReturn "${UCI_Q} set test.section.opt.=val" + assertFailWithNoReturn "${UCI_Q} set test.section.opt.zflk=val" } test_set_named_section() diff --git a/test/tests.d/050_show b/test/tests.d/050_show index 2c4665e..7d7e160 100644 --- a/test/tests.d/050_show +++ b/test/tests.d/050_show @@ -2,10 +2,10 @@ test_get_parsing() { cp ${REF_DIR}/show_parsing.data ${CONFIG_DIR}/test - assertFailWithNoReturn "${UCI} show test." - assertFailWithNoReturn "${UCI} show test.section." - assertFailWithNoReturn "${UCI} show test.section.opt." - assertFailWithNoReturn "${UCI} show test.section.opt.val." - assertFailWithNoReturn "${UCI} show test.section.opt.val.qsdf.qsd" - assertFailWithNoReturn "${UCI} show test.section.opt.valqsqsd" + assertFailWithNoReturn "${UCI_Q} show test." + assertFailWithNoReturn "${UCI_Q} show test.section." + assertFailWithNoReturn "${UCI_Q} show test.section.opt." + assertFailWithNoReturn "${UCI_Q} show test.section.opt.val." + assertFailWithNoReturn "${UCI_Q} show test.section.opt.val.qsdf.qsd" + assertFailWithNoReturn "${UCI_Q} show test.section.opt.valqsqsd" } diff --git a/test/tests.sh b/test/tests.sh index 15a4744..95be84c 100644 --- a/test/tests.sh +++ b/test/tests.sh @@ -12,6 +12,7 @@ UCI_STATIC="../uci-static" return 1 } UCI="${UCI_STATIC} -c ${CONFIG_DIR} -p ${CHANGES_DIR}" +UCI_Q="${UCI_STATIC} -c ${CONFIG_DIR} -p ${CHANGES_DIR} -q" REF_DIR="./references" SCRIPTS_DIR="./tests.d" @@ -71,6 +72,7 @@ CONFIG_DIR="${CONFIG_DIR}" \ CHANGES_DIR="${CHANGES_DIR}" \ TMP_DIR="${TMP_DIR}" \ UCI="${UCI}" \ +UCI_Q="${UCI_Q}" \ /bin/sh ${FULL_SUITE} rm -rf ${TESTS_DIR}