1.1 --- a/test/remove.sh	Fri May 01 16:48:47 2009 +0100
     1.2 +++ b/test/remove.sh	Thu Jul 02 11:31:03 2009 +0100
     1.3 @@ -1,4 +1,19 @@
     1.4  #!/bin/sh
     1.5 +fs_check_file()
     1.6 +{
     1.7 +    if [ ! -e "$RAZOR_ROOT$1" ]; then 
     1.8 +	echo $1: Not in filesystem >&2
     1.9 +	ls -R "$RAZOR_ROOT" >&2
    1.10 +	exit 1
    1.11 +    fi
    1.12 +}
    1.13 +fs_check_no_file()
    1.14 +{
    1.15 +    if [ -e "$RAZOR_ROOT$1" ]; then 
    1.16 +	echo $1: Still in filesystem >&2
    1.17 +	exit 1
    1.18 +    fi
    1.19 +}
    1.20  check_file()
    1.21  {
    1.22      ../src/razor list-files | grep -x "$1" > /dev/null
    1.23 @@ -28,10 +43,7 @@
    1.24  	    exit 1
    1.25  	fi
    1.26      done
    1.27 -    if [ ! -e "$RAZOR_ROOT$1" ]; then 
    1.28 -	echo $1: Not in filesystem >&2
    1.29 -	exit 1
    1.30 -    fi
    1.31 +    fs_check_file $1
    1.32  }
    1.33  check_no_file()
    1.34  {
    1.35 @@ -40,19 +52,18 @@
    1.36  	echo $1: Still in database >&2
    1.37  	exit 1
    1.38      fi
    1.39 -    if [ -e "$RAZOR_ROOT$1" ]; then 
    1.40 -	echo $1: Still in filesystem >&2
    1.41 -	exit 1
    1.42 -    fi
    1.43 +    fs_check_no_file $1
    1.44  }
    1.45  export RAZOR_ROOT=`mktemp -dt` || exit 1
    1.46  ../src/razor init || exit 1
    1.47  export YUM_URL="file://localhost/`pwd`"
    1.48  ../src/razor import-yum || exit 1
    1.49  ../src/razor install zip || exit 1
    1.50 +fs_check_file /usr/var/lib/zip/data.zap
    1.51  ../src/razor remove zip || exit 1
    1.52  check_file /usr/bin/zap
    1.53  check_no_file /usr/bin/zip
    1.54 +fs_check_no_file /usr/var/lib/zip/data.zap
    1.55  ../src/razor install zsh || exit 1
    1.56  ../src/razor install zsh2 || exit 1
    1.57  ../src/razor remove zsh || exit 1