X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=c38a74b96c67c72684ca05aaa5ab59fd2b17f321;hb=6bc022e40bca1b5cd4aa5878572faa3152a9195c;hp=d86388665492ba6e3336df8a8a2b4a478ef05a70;hpb=8ba61926bbe8609c4e5a9c9e5e0b12644880de92;p=monkeysphere.git diff --git a/tests/basic b/tests/basic index d863886..c38a74b 100755 --- a/tests/basic +++ b/tests/basic @@ -13,11 +13,11 @@ # all subcommands in this script should complete without failure: set -e +# piped commands should return the code of the first non-zero return set -o pipefail ## make sure that the right tools are installed to run the test. the ## test has *more* requirements than plain ol' monkeysphere: - which socat || { echo "You must have socat installed to run this test." ; exit 1; } ## FIXME: other checks? @@ -121,7 +121,6 @@ export MONKEYSPHERE_LOG_LEVEL=DEBUG export SSHD_CONFIG="$TEMPDIR"/sshd_config export SOCKET="$TEMPDIR"/ssh-socket -export SSHD_PID= # Make sure $DISPLAY is set to convince ssh and monkeysphere to fall # back on $SSH_ASKPASS. Make sure it's not set to the current actual