X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-ntfs;h=ebdb861b677dcff8150ea61fdd6fe051fe5f194e;hb=b29b7590567518adf07b08ba73d32cb4a975147a;hp=710098481ce6fe373a002bc65145f45b0aea37dd;hpb=ae4ea9fadca8e98341fedd543417bf6a204b2005;p=wimlib diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs index 71009848..ebdb861b 100755 --- a/tests/test-imagex-ntfs +++ b/tests/test-imagex-ntfs @@ -17,10 +17,14 @@ srcdir="$(cd $srcdir; pwd)" 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() { @@ -39,12 +43,12 @@ __do_mount() { 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?)" + echo "mount an 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." + "installed setuid root, so that we can mount an NTFS volume." fi fi } @@ -62,8 +66,8 @@ do_mkntfs() { 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 @@ -97,7 +101,7 @@ do_test() { echo "Dumping tree of applied image" tree out.mnt --inodes -F -s --noreport error 'Information was lost or corrupted while capturing - and then applying a NTFS volume' + and then applying an NTFS volume' fi fi rm -rf out.mnt/* in.mnt/* @@ -268,7 +272,7 @@ do_test 'echo -n 8 > file; setfattr -n user.ads3 anotherfile -v 33; echo -n > emptyfile; setfattr -n user.ads emptyfile -v 8; - setfattr -n user.ads5 emptyfile -v"`cat $srcdir/src/hardlink.c`" + setfattr -n user.ads5 emptyfile -v"`cat $srcdir/src/sha1.c`" mkdir dir/subdir; ln file dir/subdir/file; echo -n 8 > dir/subdir/file2;