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 710098481ce6fe373a002bc65145f45b0aea37dd..783c96acee22f1265d650633e827d2b0f091e1fb 100755 (executable)
--- 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() {
@@ -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