1.1 --- a/test/update.sh	Fri Oct 17 09:57:19 2014 +0100
     1.2 +++ b/test/update.sh	Mon Jul 11 16:12:45 2016 +0100
     1.3 @@ -6,37 +6,37 @@
     1.4  fi
     1.5  fs_check_file()
     1.6  {
     1.7 -    if [ ! -e "$RAZOR_ROOT$1" ]; then 
     1.8 +    if [ ! -e "$tmpdir$1" ]; then 
     1.9  	echo $1: Not in filesystem >&2
    1.10 -	ls -R "$RAZOR_ROOT" >&2
    1.11 +	ls -R "$tmpdir" >&2
    1.12  	exit 1
    1.13      fi
    1.14  }
    1.15  fs_check_file_contents()
    1.16  {
    1.17      fs_check_file "$1"
    1.18 -    if [ `cat "$RAZOR_ROOT$1"` != "$2" ]; then
    1.19 +    if [ `cat "$tmpdir$1"` != "$2" ]; then
    1.20  	echo $1: Unexpected contents >&2
    1.21 -	cat "$RAZOR_ROOT$1" >&2
    1.22 +	cat "$tmpdir$1" >&2
    1.23  	exit 1
    1.24      fi
    1.25  }
    1.26  fs_check_no_file()
    1.27  {
    1.28 -    if [ -e "$RAZOR_ROOT$1" ]; then 
    1.29 +    if [ -e "$tmpdir$1" ]; then 
    1.30  	echo $1: Still in filesystem >&2
    1.31  	exit 1
    1.32      fi
    1.33  }
    1.34  check_file()
    1.35  {
    1.36 -    $razor list-files | grep -x "$1" > /dev/null
    1.37 +    $razor list-files | grep -F -x "$1" > /dev/null
    1.38      if [ $? -ne 0 ]; then
    1.39  	echo $1: Not in database >&2
    1.40  	$razor list-files >&2
    1.41  	exit 1
    1.42      fi
    1.43 -    $razor list-files "$1" | grep -x "$1" > /dev/null
    1.44 +    $razor list-files "$1" | grep -F -x "$1" > /dev/null
    1.45      if [ $? -ne 0 ]; then
    1.46  	echo $1: Not seen by patterned list >&2
    1.47  	$razor list-files "$1" >&2
    1.48 @@ -50,7 +50,7 @@
    1.49      fi
    1.50      for nevra in "$pkgs"; do
    1.51  	name=`echo $nevra | sed 's/\-.*$//'`
    1.52 -	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    1.53 +	$razor list-package-files "$name" | grep -F -x "$1" > /dev/null
    1.54  	if [ $? -ne 0 ]; then
    1.55  	    echo $1: Not in database for package $name >&2
    1.56  	    $razor list-package-files "$name"
    1.57 @@ -61,7 +61,7 @@
    1.58  }
    1.59  check_no_file()
    1.60  {
    1.61 -    $razor list-files | grep -x "$1" > /dev/null
    1.62 +    $razor list-files | grep -F -x "$1" > /dev/null
    1.63      if [ $? -eq 0 ]; then
    1.64  	echo $1: Still in database >&2
    1.65  	exit 1
    1.66 @@ -78,13 +78,14 @@
    1.67  }
    1.68  set_repository()
    1.69  {
    1.70 +    export YUM_URL="file:`pwd`/$1"
    1.71      cp $1/repodata/primary.xml.gz $1/repodata/filelists.xml.gz .
    1.72      rm -rf rpms
    1.73 -    ln -s $1/rpms .
    1.74 +    ln -s $1/Packages rpms
    1.75  }
    1.76 -export RAZOR_ROOT=`mktemp -dt` || exit 1
    1.77 +tmpdir=`mktemp -dt` || exit 1
    1.78 +export RAZOR_ROOT="file:$tmpdir"
    1.79  $razor init || exit 1
    1.80 -export YUM_URL="file://localhost/`pwd`"
    1.81  set_repository base
    1.82  $razor import-yum || exit 1
    1.83  $razor install --relocate /usr=/opt zip || exit 1
    1.84 @@ -118,4 +119,4 @@
    1.85  $razor install --relocate /usr=/opt zip || exit 1
    1.86  $razor update --relocate /usr=/opt zip || exit 1
    1.87  check_install_count zip 1
    1.88 -rm -rf "$RAZOR_ROOT"
    1.89 +rm -rf "$tmpdir"