diff -r bae5adee8c8c -r 9e2943af74fe test/remove.sh --- a/test/remove.sh Fri Oct 17 09:57:19 2014 +0100 +++ b/test/remove.sh Mon Jul 11 16:50:21 2016 +0100 @@ -6,28 +6,28 @@ fi fs_check_file() { - if [ ! -e "$RAZOR_ROOT$1" ]; then + if [ ! -e "$tmpdir$1" ]; then echo $1: Not in filesystem >&2 - ls -R "$RAZOR_ROOT" >&2 + ls -R "$tmpdir" >&2 exit 1 fi } fs_check_no_file() { - if [ -e "$RAZOR_ROOT$1" ]; then + if [ -e "$tmpdir$1" ]; then echo $1: Still in filesystem >&2 exit 1 fi } check_file() { - $razor list-files | grep -x "$1" > /dev/null + $razor list-files | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not in database >&2 $razor list-files >&2 exit 1 fi - $razor list-files "$1" | grep -x "$1" > /dev/null + $razor list-files "$1" | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not seen by patterned list >&2 $razor list-files "$1" >&2 @@ -41,7 +41,7 @@ fi for nevra in "$pkgs"; do name=`echo $nevra | sed 's/\-.*$//'` - $razor list-package-files "$name" | grep -x "$1" > /dev/null + $razor list-package-files "$name" | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not in database for package $name >&2 $razor list-package-files "$name" @@ -52,16 +52,17 @@ } check_no_file() { - $razor list-files | grep -x "$1" > /dev/null + $razor list-files | grep -F -x "$1" > /dev/null if [ $? -eq 0 ]; then echo $1: Still in database >&2 exit 1 fi fs_check_no_file $1 } -export RAZOR_ROOT=`mktemp -dt` || exit 1 +tmpdir=`mktemp -dt` || exit 1 +export RAZOR_ROOT="file:$tmpdir" $razor init || exit 1 -export YUM_URL="file://localhost/`pwd`" +export YUM_URL="file:`pwd`/base" $razor import-yum || exit 1 $razor install --relocate /usr=/opt zip || exit 1 fs_check_file /opt/var/lib/zip/data.zap @@ -81,4 +82,4 @@ fs_check_file /opt/var/lib/zip/data.zap $razor remove zsh2 zip || exit 1 fs_check_no_file /opt/var/lib/zip/data.zap -rm -rf "$RAZOR_ROOT" +rm -rf "$tmpdir"