diff -r c75a2d5caae9 -r f8c27fe9fe63 test/remove.sh --- a/test/remove.sh Fri May 01 16:48:47 2009 +0100 +++ b/test/remove.sh Fri Jun 12 16:59:11 2009 +0100 @@ -1,4 +1,19 @@ #!/bin/sh +fs_check_file() +{ + if [ ! -e "$RAZOR_ROOT$1" ]; then + echo $1: Not in filesystem >&2 + ls -R "$RAZOR_ROOT" >&2 + exit 1 + fi +} +fs_check_no_file() +{ + if [ -e "$RAZOR_ROOT$1" ]; then + echo $1: Still in filesystem >&2 + exit 1 + fi +} check_file() { ../src/razor list-files | grep -x "$1" > /dev/null @@ -28,10 +43,7 @@ exit 1 fi done - if [ ! -e "$RAZOR_ROOT$1" ]; then - echo $1: Not in filesystem >&2 - exit 1 - fi + fs_check_file $1 } check_no_file() { @@ -40,19 +52,18 @@ echo $1: Still in database >&2 exit 1 fi - if [ -e "$RAZOR_ROOT$1" ]; then - echo $1: Still in filesystem >&2 - exit 1 - fi + fs_check_no_file $1 } export RAZOR_ROOT=`mktemp -dt` || exit 1 ../src/razor init || exit 1 export YUM_URL="file://localhost/`pwd`" ../src/razor import-yum || exit 1 ../src/razor install zip || exit 1 +fs_check_file /usr/var/lib/zip/data.zap ../src/razor remove zip || exit 1 check_file /usr/bin/zap check_no_file /usr/bin/zip +fs_check_no_file /usr/var/lib/zip/data.zap ../src/razor install zsh || exit 1 ../src/razor install zsh2 || exit 1 ../src/razor remove zsh || exit 1