X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=a75c4cd82dfd78c41c21dfed034a87af896c3a67;hp=6e04673a71823822e5d2e2533ee7713a4f6a8beb;hb=ae4ea9fadca8e98341fedd543417bf6a204b2005;hpb=e485f32e610f77f15a298f62647d0cfb3cf8d11b

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 6e04673a..a75c4cd8 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -10,11 +10,20 @@ 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.
+	imagex unmount "$@" --lazy
+}
 
 cleanup() {
 	fusermount -u $TEST_SUBDIR/tmp &> /dev/null || true
@@ -24,7 +33,7 @@ cleanup() {
 
 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,9 +45,15 @@ 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
+	imagex capture tmp.empty empty.wim --norpfix
 }
 
+if [ ! -r /dev/fuse ]; then
+	echo "WARNING: /dev/fuse is not readable."
+	echo "Skipping WIM mounting checks"
+	skip_test
+fi
+
 cleanup
 mkdir $TEST_SUBDIR
 cd $TEST_SUBDIR
@@ -54,8 +69,8 @@ for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do
 	fi
 	mkdir tmp
 	if ! imagex mount dir.wim dir tmp; then
-		error "Failed to mount test WIM read-only" \
-		      "Please read any error messages above before reporting this test failure."\
+		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
@@ -85,14 +100,14 @@ for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do
 		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; 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
 		error "Failed to re-mount WIM read-only"
 	fi
-	if ! imagex unmount tmp --commit; then
+	if ! imagex_unmount tmp --commit; then
 		error "Failed to unmount read-only WIM with --commit flag (should be ignored)"
 	fi
 	rm -rf tmp dir.wim
@@ -108,14 +123,14 @@ if ! imagex mountrw dir.wim dir tmp; then
 	error "Failed to mount test WIM read-write"
 fi
 echo "Testing unmounting WIM unmodified"
-if ! imagex unmount tmp; then
+if ! imagex_unmount tmp; 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
 	error "Failed to re-mount test WIM read-write"
 fi
-if ! imagex unmount tmp --commit --check; then
+if ! imagex_unmount tmp --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"
@@ -156,7 +171,7 @@ if ! diff -q tmp/newdir/zeroes1 tmp/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 --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
@@ -209,12 +224,12 @@ do_test() {
 	tar cf ../test.tar .
 	cd ..
 
-	if ! imagex mountrw test.wim tmp.mnt; then
+	if ! imagex mountrw test.wim tmp.mnt --unix-data; then
 		error "Failed to mount WIM read-write"
 	fi
 
 	cd tmp.mnt
-	if ! tar xf ../test.tar --no-same-owner; then
+	if ! tar xf ../test.tar; then
 		error "Failed to untar archive on read-write mounted WIM"
 	fi
 	cd ..
@@ -229,7 +244,7 @@ do_test() {
 	fi
 
 	cd tmp.mnt
-	if ! tar xf ../test.tar --no-same-owner; then
+	if ! tar xf ../test.tar; then
 		error "Failed to untar archive on read-write mounted WIM"
 	fi
 	cd ..
@@ -239,7 +254,7 @@ 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