test-imagex-ntfs: Try to work around yet another race condition

[wimlib] / tests / test-imagex-ntfs

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index afe441fb208d6d85a5dc7f48c443d6dd9a77e927..783c96acee22f1265d650633e827d2b0f091e1fb 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -14,15 +14,17 @@ srcdir="${srcdir:-.}/.."
 srcdir="$(cd $srcdir; pwd)"
 . "$srcdir/tests/tests-common.sh"
 
-imagex() {
-       ../imagex $@ > /dev/null
-}
+TEST_SUBDIR=tmpdir_test-imagex-ntfs
 
 __do_unmount() {
-       if !  fusermount -z -u $1; then
-               error "Failed to unmount \"$1\""
-       fi
-
+       for ((i = 0; i < 10; i++)); do
+               if fusermount -z -u $1; then
+                       return 0
+               else
+                       sleep 1
+               fi
+       done
+       error "Failed to unmount \"$1\""
 }
 
 do_unmount() {
@@ -31,17 +33,23 @@ do_unmount() {
        fi
 }
 
+skip_test() {
+       cd ..
+       cleanup
+       exit 77
+}
+
 __do_mount() {
-       options="$3"
-       if [ -z "$options" ]; then
-               options="no_def_opts,silent"
-       else
-               options="$options,no_def_opts,silent"
-       fi
-       if ! ntfs-3g -o $options $1 $2; then
-               error "Could not mount NTFS volume \"$1\" on \"$2\"!  Make sure ntfs-3g is "\
-                     "installed, and that you are either running the tests as root or have ntfs-3g "\
-                     "installed setuid root, so that we can mount a NTFS volume."
+       if ! ntfs-3g -o "no_def_opts,silent" $1 $2; then
+               if [ $UID -ne 0 ] && [ "$3" = "nofail" ]; then
+                       echo "WARNING: skipping NTFS tests because we aren't able to "
+                       echo "mount a NTFS volume (perhaps ntfs-3g is not installed setuid root?)"
+                       skip_test
+               else
+                       error "Could not mount NTFS volume \"$1\" on \"$2\"!  Make sure ntfs-3g is "\
+                             "installed, and that you are either running the tests as root or have ntfs-3g "\
+                             "installed setuid root, so that we can mount a NTFS volume."
+               fi
        fi
 }
 
@@ -51,38 +59,25 @@ do_mount() {
 }
 
 do_mkntfs() {
-       if ! mkntfs --force --fast $1 &> /dev/null; then
+       if ! mkntfs --force --fast $1 > /dev/null; then
                error "Could not create NTFS volume \"$1\"!  Make sure ntfsprogs are installed."
        fi
 }
 
 init() {
        echo "Creating NTFS volumes and empty directories to use as mountpoints"
-       dd if=/dev/zero of=in.ntfs bs=4096 count=500 &> /dev/null
-       dd if=/dev/zero of=out.ntfs bs=4096 count=500 &> /dev/null
+       dd if=/dev/zero of=in.ntfs bs=4096 count=1000 &> /dev/null
+       dd if=/dev/zero of=out.ntfs bs=4096 count=1000 &> /dev/null
        mkdir in.mnt out.mnt
        do_mkntfs in.ntfs
        do_mkntfs out.ntfs
-       do_mount in.ntfs in.mnt
+       do_mount in.ntfs in.mnt nofail
 }
 
 cleanup() {
-       do_unmount in.mnt
-       do_unmount out.mnt
-       rm -rf in.ntfs out.ntfs in.mnt out.mnt in.xattr out.xattr ntfs.wim
-}
-#trap cleanup exit
-
-
-error() {
-       echo "****************************************************************"
-       echo "                         Test failure                           "
-       while [ $# -gt 0 ]; do
-               echo $1
-               shift
-       done
-       echo "****************************************************************"
-       exit 1
+       do_unmount $TEST_SUBDIR/in.mnt
+       do_unmount $TEST_SUBDIR/out.mnt
+       rm -rf $TEST_SUBDIR
 }
 
 do_test() {
@@ -101,7 +96,7 @@ do_test() {
        if [ -x /usr/bin/tree ]; then
                tree in.mnt --inodes -F -s --noreport
        fi
-       if ! ./tree-cmp in.mnt out.mnt NTFS; then
+       if ! ../tree-cmp in.mnt out.mnt NTFS; then
                if [ -x /usr/bin/tree ]; then
                        echo "Dumping tree of applied image"
                        tree out.mnt --inodes -F -s --noreport
@@ -119,6 +114,8 @@ msg() {
 }
 
 cleanup
+mkdir $TEST_SUBDIR
+cd $TEST_SUBDIR
 init
 
 msg "Empty NTFS volume"
@@ -233,7 +230,7 @@ do_test 'echo 999 > file;
         #setfattr -v DOSNAME -n system.ntfs_dos_name file;'
 
 msg "C source code of wimlib"
-do_test 'cp $srcdir/src/*.{c,h} .'
+do_test 'cp $srcdir/src/*.c .'
 
 msg "file with security descriptor"
 do_test 'touch file;
@@ -288,8 +285,10 @@ do_test 'echo -n 8 > file;
         setfattr -n user.yet_another_ads3 -v "abc" dir/subdir/link;
         setfattr -n user.yet_another_ads4 -v "" dir/subdir/link;'
 
-cleanup
-
 echo "**********************************************************"
 echo "           NTFS capture/apply tests passed                "
 echo "**********************************************************"
+
+cd ..
+cleanup
+