[Libguestfs] [PATCH 2/2] actions: mark btrfs test case of vfs_minimum_size as TestRunOrUnsupported

Richard W.M. Jones rjones at redhat.com
Wed Jan 27 15:18:00 UTC 2016


On Wed, Jan 27, 2016 at 02:26:33PM +0100, Pino Toscano wrote:
> The btrfs implementation of vfs_minimum_size requires
> btrfs-progs >= 4.2, erroring with ENOTSUP otherwise; thus mark the btrfs
> test case of the vfs_minimum_size tests as TestRunOrUnsupported, so it
> will not cause failures if the available btrfs-progs is not enough.
> ---
>  generator/actions.ml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/generator/actions.ml b/generator/actions.ml
> index 14902e7..0d227cf 100644
> --- a/generator/actions.ml
> +++ b/generator/actions.ml
> @@ -12765,7 +12765,7 @@ To read the UUID on a filesystem, call C<guestfs_vfs_uuid>." };
>        InitPartition, IfAvailable "ntfsprogs", TestRun(
>          [["mkfs"; "ntfs"; "/dev/sda1"; ""; "NOARG"; ""; ""; "NOARG"];
>           ["vfs_minimum_size"; "/dev/sda1"]]), [];
> -      InitPartition, IfAvailable "btrfs", TestRun (
> +      InitPartition, IfAvailable "btrfs", TestRunOrUnsupported (
>          [["mkfs"; "btrfs"; "/dev/sda1"; ""; "NOARG"; ""; ""; "NOARG"];
>           ["mount"; "/dev/sda1"; "/"];
>           ["vfs_minimum_size"; "/dev/sda1"]]), [];
> -- 

ACK series.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v




More information about the Libguestfs mailing list