mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

sparsify: Fix test-virt-sparsify-in-place-fstrim-unsupported.sh

Browse Source 
Since Linux commit f663b5b38fff trimming vfat is now supported by
Linux.  This broke the test which assumed it was not supported.  Use
another filesystem (minix) which does not support trimming instead.

Thanks: Daniel P. Berrangé and Pino Toscano.
This commit is contained in:
Richard W.M. Jones
2018-09-05 17:28:57 +01:00
parent 165add060e
commit da48f4e5ff
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh
View File

@@ -21,13 +21,11 @@
#
# https://bugzilla.redhat.com/show_bug.cgi?id=1364347
#
# This test assumes that the kernel vfat driver does not support
# This test assumes that the kernel minix driver does not support
# fstrim. It might become supported in a future kernel version in
# which case we could use a different filesystem for this test, or
# delete the test if we are confident that all common filesystems are
# supported.
#
# The reason why vfat is significant is because UEFI guests use it.
set -e
set -x
@@ -36,13 +34,14 @@ $TEST_FUNCTIONS
skip_if_skipped
# UML does not support discard.
skip_if_backend uml
skip_unless_filesystem_available minix
img=test-virt-sparsify-in-place-fstrim-unsupported.img
log=test-virt-sparsify-in-place-fstrim-unsupported.log
rm -f $img $log
# Create a test filesystem with a single vfat filesystem.
guestfish -N $img=fs:vfat exit
# Create a test filesystem with a single minix filesystem.
guestfish -N $img=fs:minix exit
# This should warn.
virt-sparsify --in-place $img |& tee $log
@@ -58,8 +57,8 @@ if grep "warning:.*fstrim.*not supported" $log; then
exit 1
fi
# Create a test filesystem with vfat and ext4 filesystems.
guestfish -N $img=bootroot:vfat:ext4 exit
# Create a test filesystem with minix and ext4 filesystems.
guestfish -N $img=bootroot:minix:ext4 exit
# This should warn.
virt-sparsify --in-place $img |& tee $log

10
tests/test-functions.sh
View File

@@ -198,6 +198,16 @@ skip_unless_feature_available ()
fi
}
# Skip if a filesystem is unavailable in the daemon.
skip_unless_filesystem_available ()
{
r="$(guestfish -a /dev/null run : filesystem_available "$1")"
if [ "$r" != "true" ] ; then
echo "$(basename $0): test skipped because $1 filesystem is not available"
exit 77
fi
}
# Skip unless the libvirt minimum version is met.
skip_unless_libvirt_minimum_version ()
{