X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=b1fe9edcf9ebe08fddebc60b7d766041c902bbc1;hb=e71c7bb4dff26178f714cd0fcdbb3058effa4066;hp=9c5b280a7134b22a32c4e0336db84ced3ddf5f5c;hpb=eb88374be90344d1808fe49a5bc69a547a09280d;p=monkeysphere.git diff --git a/tests/basic b/tests/basic index 9c5b280..b1fe9ed 100755 --- a/tests/basic +++ b/tests/basic @@ -51,6 +51,8 @@ gpgadmin() { # test ssh connection # first argument is expected return code from ssh connection ssh_test() { + local RETURN=0 + umask 0077 CODE=${1:-0} @@ -136,22 +138,6 @@ export SOCKET="$TEMPDIR"/ssh-socket # *anything* with any running X11 session. export DISPLAY=monkeys -## make sure that the version number matches the debian changelog -## (don't bother if this is being run from the tests). - -if [ -f "$TESTDIR"/../packaging/debian/changelog ]; then - echo - echo "##################################################" - echo "### checking version string match..." - repver=$(monkeysphere version) - debver=$(head -n1 "$TESTDIR"/../packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/') - if [ "$repver" = "$debver" ] ; then - echo "Versions match!" - else - printf "reported version string (%s) does not match debian changelog (%s)\n" "$repver" "$debver" - exit 1 - fi -fi ###################################################################### ### CONFIGURE ENVIRONMENTS