From 8b4c1860241f11c1db36e544f90e48c5006d51cc Mon Sep 17 00:00:00 2001 From: Hanjo Meinhardt Date: Sat, 27 Jan 2018 21:37:23 +0100 Subject: [PATCH] handle missing sendxmpp binary --- test/sendxmpp_parameter_test.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/sendxmpp_parameter_test.sh b/test/sendxmpp_parameter_test.sh index 5577b26..2976e0f 100755 --- a/test/sendxmpp_parameter_test.sh +++ b/test/sendxmpp_parameter_test.sh @@ -1,6 +1,9 @@ # !/bin/sh setUp() { + # if sendxmpp is present command will fail with err code 1 because of invalid domain + # otherwise it will ultimatly fail with return code 127 aka command not found + command -v sendxmpp > /dev/null && export EXPECTED_RETURN_CODE=1 || export EXPECTED_RETURN_CODE=127 export PLUGIN_USERNAME="username" export PLUGIN_PASSWORD="password" export PLUGIN_JSERVER="server.invalid" @@ -18,7 +21,7 @@ tearDown() { testAllOk() { stdout=$( ../sendxmpp.sh 2> /dev/null ) - assertEquals 1 $? + assertEquals $EXPECTED_RETURN_CODE $? assertTrue "[ -z "$stdout" ]" } @@ -36,7 +39,7 @@ testUsernameSecretSet() { export SENDXMPP_USERNAME="secretusername" stdout=$( ../sendxmpp.sh 2> /dev/null ) - assertEquals 1 $? + assertEquals $EXPECTED_RETURN_CODE $? assertTrue "[ -z "$stdout" ]" } @@ -54,7 +57,7 @@ testPasswordSecretSet() { export SENDXMPP_PASSWORD="secretpassword" stdout=$( ../sendxmpp.sh 2> /dev/null ) - assertEquals 1 $? + assertEquals $EXPECTED_RETURN_CODE $? assertTrue "[ -z "$stdout" ]" }