test-imagex-ntfs: remove unusable DOS name tests

[wimlib] / tests / test-imagex-ntfs

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 710098481ce6fe373a002bc65145f45b0aea37dd..4fd1baa1145926328e98f1e4f186d3419729faf6 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() {
@@ -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
@@ -81,10 +85,10 @@ do_test() {
        eval "$1"
        cd ..
        __do_unmount in.mnt
-       if ! imagex capture in.ntfs ntfs.wim; then
+       if ! wimcapture in.ntfs ntfs.wim; then
                error "Failed to capture NTFS volume into a WIM"
        fi
-       if ! imagex apply ntfs.wim 1 out.ntfs; then
+       if ! wimapply ntfs.wim 1 out.ntfs; then
                error "Failed to apply WIM to NTFS volume"
        fi
        __do_mount in.ntfs in.mnt noatime
@@ -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/*
@@ -150,20 +154,6 @@ do_test "dd if=/dev/zero of=file bs=4096 count=10 &> /dev/null"
 msg "file with DOS name"
 do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file"
 
-# To be replaced/removed: files with DOS names can no longer be hard linked as
-# of NTFS-3g 2013.1.13.
-
-#msg "file with DOS name with alphabetically smaller hardlink in same directory"
-#do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file; ln file aaa_link"
-
-#msg "file with DOS name with alphabetically larger hardlink in same directory"
-#do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file; ln file zzz_link"
-
-#msg "file with long name and with DOS name with alphabetically smaller hardlink in same directory"
-#do_test 'echo 1 > file_with_a_long_name;
-        #setfattr -v "file~1" -n system.ntfs_dos_name file_with_a_long_name;
-        #ln file_with_a_long_name aaa_link'
-
 msg "many nested directories"
 do_test 'mkdir dir; mkdir dir/subdir; mkdir dir/subdir/subdir2; mkdir dir/subdir/subdir3'
 
@@ -216,15 +206,6 @@ do_test 'echo 999 > file;
         setfattr -n user.ads -v "888" file;
         ln file link;'
 
-# To be replaced/removed: files with DOS names can no longer be hard linked as
-# of NTFS-3g 2013.1.13.
-
-#msg "file with named data stream with hardlink and DOS name"
-#do_test 'echo 999 > file;
-        #setfattr -n user.ads -v "888" file;
-        #ln file link;
-        #setfattr -v DOSNAME -n system.ntfs_dos_name file;'
-
 msg "C source code of wimlib"
 do_test 'cp $srcdir/src/*.c .'
 
@@ -268,7 +249,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;