From: David Levine Date: Tue, 21 Feb 2012 04:02:26 +0000 (-0600) Subject: Migrated a couple more tests to use run_test() in common.sh. X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=b0b7ee58c482bf36063e6158f610dd337f3ca568;p=mmh Migrated a couple more tests to use run_test() in common.sh. --- diff --git a/test/format/test-myhost b/test/format/test-myhost index d7e53e1..27069af 100755 --- a/test/format/test-myhost +++ b/test/format/test-myhost @@ -13,23 +13,15 @@ fi setup_test -runtest() -{ - testoutput=$(${MH_LIB_DIR}/ap -format "%(myhost)" ignore) - - if [ x"$1" != x"${testoutput}" ]; then - echo "For $2, expected $1 but got ${testoutput}" - exit 1 - fi -} - -runtest "$(hostname)" "local hostname test" +run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "`hostname`" \ + "local hostname test" cp ${MHMTSCONF} ${MH_TEST_DIR}/Mail/mts.conf || exit 1 export MHMTSCONF="${MH_TEST_DIR}/Mail/mts.conf" echo "localname: some.random.name" >> ${MHMTSCONF} -runtest "some.random.name" "mts.conf localname test" +run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "some.random.name" \ + "mts.conf localname test" -exit 0 +exit $failed diff --git a/test/format/test-mymbox b/test/format/test-mymbox index e1d1ead..e3decd9 100755 --- a/test/format/test-mymbox +++ b/test/format/test-mymbox @@ -13,33 +13,24 @@ fi setup_test -runtest() -{ - testoutput=$(${MH_LIB_DIR}/ap -format "%(mymbox{text})" "$1") +user="`id -un`" +host="`hostname`" - if [ -z "${testoutput}" ]; then - echo "Test program did not return anything for $3" - exit 1 - fi - - if [ "${testoutput}" -ne $2 ]; then - echo "Did not get expected output for $3" - exit 1 - fi -} - -user="$(id -un)" -host="$(hostname)" - -runtest "${user}" 1 "Basic user test" -runtest "${user}@${host}" 1 "Basic user@host test" -runtest "nosuchuser@nosuchhost.blah" 0 "Basic non-matching test" +run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}" \ + 1 "Basic user test" +run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}@${host}" \ + 1 "Basic user@host test" +run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \ + 0 "Basic non-matching test" myname="Random User " echo "Local-Mailbox: ${myname}" >> ${MH} -runtest "${myname}" 1 "Local-Mailbox test" -runtest "${user}@${host}" 0 "Local-mailbox overriding user@host test" +run_test "echo `${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \ + 1 "Local-Mailbox test" + +run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}@${host}" \ + 0 "Local-mailbox overriding user@host test" -exit 0 +exit $failed