X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=1bde84de180b80581cf89a4c3c7c06d803475995;hp=906a3d65c76e0cc0e40ce0518bef7613a1f85f12;hb=d85424218ef1148204aac3289bbf4ba2c0da9255;hpb=8eaff5673d8e133e72e20cf4409ab4c901831424

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 906a3d65..1bde84de 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -10,21 +10,29 @@ srcdir="$(cd $srcdir; pwd)"
 
 TEST_SUBDIR=tmpdir_test-imagex-mount
 
-if [ ! -r /dev/fuse ]; then
-	echo "WARNING: /dev/fuse is not readable."
-	echo "Skipping WIM mounting checks"
-	exit 0
-fi
+skip_test() {
+	cd ..
+	cleanup
+	exit 77
+}
+
+imagex_unmount() {
+	# Give the --lazy flag to work around a problem testing on Ubuntu and
+	# other OS's running Gnome, as they have a daemon
+	# "gvfs-gdu-volume-monitor" that apparently likes to randomly read
+	# filesystems that get mounted, thereby stopping them from being
+	# unmounted.
+	wimunmount "$@" --lazy
+}
 
 cleanup() {
-	fusermount -u $TEST_SUBDIR/tmp &> /dev/null || true
 	fusermount -u $TEST_SUBDIR/tmp.mnt &> /dev/null || true
 	rm -rf $TEST_SUBDIR
 }
 
 init() {
 	mkdir dir
-	cp $srcdir/src/*.c $srcdir/src/*.h dir
+	cp $srcdir/src/*.c dir
 	mkdir dir/subdir
 	echo 'hello' > dir/subdir/hello
 	echo 'hello' > dir/subdir/hello2
@@ -36,145 +44,149 @@ init() {
 	echo 'testing' > dir2/file
 	dd if=/dev/zero of=dir2/zeroes bs=4096 count=5
 	mkdir tmp.empty tmp.mnt tmp.apply tmp.orig
-	imagex capture tmp.empty empty.wim
+	wimcapture tmp.empty empty.wim --norpfix
 }
 
+if [ ! -r /dev/fuse ] || [ ! -w /dev/fuse ]; then
+	echo "WARNING: /dev/fuse is not readable and writable."
+	echo "Skipping WIM mounting checks"
+	skip_test
+fi
+
 cleanup
 mkdir $TEST_SUBDIR
 cd $TEST_SUBDIR
 init
 
-# imagex mount
+# wimmount
 
 for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do
 	echo "Using flag $flag"
 	echo "Testing mounting WIM read-only"
-	if ! imagex capture dir dir.wim $flag; then
+	if ! wimcapture dir dir.wim $flag; then
 		error "Failed to capture WIM"
 	fi
-	mkdir tmp
-	if ! imagex mount dir.wim dir tmp; then
+	if ! wimmount dir.wim dir tmp.mnt; then
 		error "Failed to mount test WIM read-only. " \
 		      "Please read any error messages above before reporting this test failure. "\
 		      "Perhaps you don't have FUSE installed, or the FUSE kernel module isn't" \
 		      "loaded, or you aren't a member of the FUSE group?"
 	fi
 	echo "Testing extracting file from mounted read-only WIM"
-	if ! cp tmp/lz77.c lz77.c; then
+	if ! cp tmp.mnt/write.c write.c; then
 		error "Failed to extract file from read-only mounted WIM"
 	fi
-	if ! diff -q dir/lz77.c lz77.c; then
+	if ! diff -q dir/write.c write.c; then
 		error "Extracted file does not match copy in mounted WIM"
 	fi
-	if ! diff -q tmp/lz77.c dir/lz77.c; then
+	if ! diff -q tmp.mnt/write.c dir/write.c; then
 		error "Extractef file does not match original"
 	fi
-	rm -f lz77.c
+	rm -f write.c
 	echo "Testing modifying mounted read-only WIM (should fail)"
-	if rm tmp/lz77.c; then
+	if rm tmp.mnt/write.c; then
 		error "Removing file from read-only mounted WIM didn't fail"
 	fi
-	if touch tmp/newfile; then
+	if touch tmp.mnt/newfile; then
 		error "Creating file on read-only mounted WIM didn't fail"
 	fi
-	if echo 3 > tmp/lz77.c; then
+	if echo 3 > tmp.mnt/write.c; then
 		error "Writing to file on read-only mounted WIM didn't fail"
 	fi
 	echo "Testing diff of mounted read-only WIM with original directory"
-	if ! diff -q -r tmp dir; then
+	if ! diff -q -r tmp.mnt dir; then
 		error "Recursive diff of read-only mounted WIM with original directory failed"
 	fi
 	echo "Testing unmount of read-only filesystem"
-	if ! imagex unmount tmp; then
+	if ! imagex_unmount tmp.mnt; then
 		error "Unmounting read-only WIM failed"
 	fi
 	echo "Testing unmount of read-only filesystem with --commit given"
-	if ! imagex mount dir.wim dir tmp; then
+	if ! wimmount dir.wim dir tmp.mnt; then
 		error "Failed to re-mount WIM read-only"
 	fi
-	if ! imagex unmount tmp --commit; then
+	if ! imagex_unmount tmp.mnt --commit; then
 		error "Failed to unmount read-only WIM with --commit flag (should be ignored)"
 	fi
-	rm -rf tmp dir.wim
+	rm -rf dir.wim
 done
 
-# imagex mountrw
+# wimmountrw
 echo "Testing mounting WIM read-write"
-if ! imagex capture dir dir.wim; then
+if ! wimcapture dir dir.wim; then
 	error "Failed to capture WIM"
 fi
-mkdir tmp
-if ! imagex mountrw dir.wim dir tmp; then
+if ! wimmountrw dir.wim dir tmp.mnt; then
 	error "Failed to mount test WIM read-write"
 fi
 echo "Testing unmounting WIM unmodified"
-if ! imagex unmount tmp; then
+if ! imagex_unmount tmp.mnt; then
 	error "Failed to unmount test WIM unmodified"
 fi
 echo "Testing unmounting WIM unmodified with --commit and --check"
-if ! imagex mountrw dir.wim dir tmp; then
+if ! wimmountrw dir.wim dir tmp.mnt; then
 	error "Failed to re-mount test WIM read-write"
 fi
-if ! imagex unmount tmp --commit --check; then
+if ! imagex_unmount tmp.mnt --commit --check; then
 	error "Failed to unmount read-write mounted WIM with changes commited (no changes made)"
 fi
 echo "Testing removing file from mounted WIM"
-if ! imagex mountrw dir.wim dir tmp; then
+if ! wimmountrw dir.wim dir tmp.mnt; then
 	error "Failed to re-mount test WIM read-write"
 fi
-if ! rm tmp/lz77.c; then
+if ! rm tmp.mnt/write.c; then
 	error "Failed to remove file from read-write mounted WIM"
 fi
-if test -f tmp/lz77.c; then
+if test -f tmp.mnt/write.c; then
 	error "Removing file from read-write mounted WIM failed"
 fi
 echo "Testing making directory in mounted WIM"
-if ! mkdir tmp/newdir; then
+if ! mkdir tmp.mnt/newdir; then
 	error "Failed to make directory in read-write mounted WIM"
 fi
-if ! test -d tmp/newdir; then
+if ! test -d tmp.mnt/newdir; then
 	error "Making directory in read-write mounted WIM failed"
 fi
 echo "Testing making new empty file in mounted WIM"
-if ! touch tmp/newdir/empty_file; then
+if ! touch tmp.mnt/newdir/empty_file; then
 	error "Could not create new empty file in read-write mounted WIM"
 fi
-if ! test -f tmp/newdir/empty_file; then
+if ! test -f tmp.mnt/newdir/empty_file; then
 	error "New empty file not created correctly in read-write mounted WIM"
 fi
-if ! test "`get_file_size tmp/newdir/empty_file`" = 0; then
+if ! test "`get_file_size tmp.mnt/newdir/empty_file`" = 0; then
 	error "New empty file in read-write mounted WIM is not empty"
 fi
 echo "Testing making new non-empty file in mounted WIM"
-if ! dd if=/dev/zero of=tmp/newdir/zeroes1 bs=1 count=4096; then
+if ! dd if=/dev/zero of=tmp.mnt/newdir/zeroes1 bs=1 count=4096; then
 	error "Failed to make new non-empty file in mounted WIM"
 fi
-if ! dd if=/dev/zero of=tmp/newdir/zeroes2 bs=4096 count=1; then
+if ! dd if=/dev/zero of=tmp.mnt/newdir/zeroes2 bs=4096 count=1; then
 	error "Failed to make new non-empty file in mounted WIM"
 fi
-if ! diff -q tmp/newdir/zeroes1 tmp/newdir/zeroes2; then
+if ! diff -q tmp.mnt/newdir/zeroes1 tmp.mnt/newdir/zeroes2; then
 	error "New files in mounted WIM not made correctly"
 fi
 echo "Unmounting WIM with changes committed and --check"
-if ! imagex unmount tmp --commit --check; then
+if ! imagex_unmount tmp.mnt --commit --check; then
 	error "Failed to unmount read-write mounted WIM"
 fi
-if test "`imagex info dir.wim | grep Integrity | awk '{print $3}'`" != "yes"; then
+if ! wiminfo dir.wim | grep -q Integrity; then
 	error "Integrity information was not included"
 fi
-rm -rf tmp
-if ! imagex apply dir.wim tmp; then
+if ! wimapply dir.wim tmp.apply; then
 	error "Failed to apply WIM we had previously mounted read-write"
 fi
-if ! diff -q tmp/newdir/zeroes1 tmp/newdir/zeroes2; then
+if ! diff -q tmp.apply/newdir/zeroes1 tmp.apply/newdir/zeroes2; then
 	error "The new non-empty files we made in the read-write mounted WIM were not extracted correctly"
 fi
-if test `get_file_size tmp/newdir/empty_file` != 0; then
+if test `get_file_size tmp.apply/newdir/empty_file` != 0; then
 	error "The new empty file we made in the read-write mounted WIM was not extracted correctly"
 fi
-if test `get_file_size tmp/newdir/zeroes1` != 4096; then
+if test `get_file_size tmp.apply/newdir/zeroes1` != 4096; then
 	error "The new non-empty files we made in the read-write mounted WIM were not extracted correctly"
 fi
+rm -rf tmp.apply/*
 
 # Now do some tests using tar.
 do_tree_cmp() {
@@ -209,7 +221,7 @@ do_test() {
 	tar cf ../test.tar .
 	cd ..
 
-	if ! imagex mountrw test.wim tmp.mnt --unix-data; then
+	if ! wimmountrw test.wim tmp.mnt --unix-data; then
 		error "Failed to mount WIM read-write"
 	fi
 
@@ -239,10 +251,10 @@ do_test() {
 
 	# Unmount the WIM, apply it, and diff the original tree with the applied
 	# tree
-	if ! imagex unmount tmp.mnt --commit; then
+	if ! imagex_unmount tmp.mnt --commit; then
 		error "Failed to unmount WIM mounted read-write"
 	fi
-	if ! imagex apply test.wim tmp.apply; then
+	if ! wimapply test.wim tmp.apply; then
 		error "Failed to apply WIM we previously had mounted read-write"
 	fi
 	do_tree_cmp tmp.orig tmp.apply