[PATCH] storagepoolxml2argvtest: Populate test entries for macOS

[Andrea Bolognani]

On Mon, 2020-10-26 at 00:54 +0300, Roman Bolshakov wrote:
> One of the cases fails on macOS:
> 
>   15) Storage Pool XML-2-argv pool-netfs-gluster
>       ...
>   In
>   '/Users/roolebo/dev/libvirt/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv':
>   Offset 39
>   Expect [-o direct-io-mode=1 /mnt/gluster]
>   Actual [/mnt/gluster -o direct-io-mode=1]
> 
> glusterfs has not been tested on macOS but for now we can just make
> tests happy by providing them with the data they expect. Likely,
> there'll be updates to the argv files in the future.
> 
> storagepoolxml2argvtest passes after the change.
> 
> Signed-off-by: Roman Bolshakov <r.bolshakov at yadro.com>
> ---
>  tests/storagepoolxml2argvdata/pool-fs-darwin.argv               | 1 +
>  tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv       | 1 +
>  tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv       | 1 +
>  tests/storagepoolxml2argvdata/pool-netfs-darwin.argv            | 1 +
>  tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv    | 1 +
>  .../storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv | 1 +
>  tests/storagepoolxml2argvtest.c                                 | 2 ++
>  7 files changed, 8 insertions(+)
>  create mode 100644 tests/storagepoolxml2argvdata/pool-fs-darwin.argv
>  create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv
>  create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv
>  create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-darwin.argv
>  create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv
>  create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv

This is unnecessarily complicated: all you need is

  diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv
  index 4303d514ef..97be9cbeb3 100644
  --- a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv
  +++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv
  @@ -1 +1 @@
  -mount -t glusterfs example.com:/volume -o direct-io-mode=1 /mnt/gluster
  +mount -t glusterfs example.com:/volume /mnt/gluster -o direct-io-mode=1

If you dig through the git history, you'll see that when
default_mount_opts was added to src/storage/storage_util.c, one of
the virCommandAddArgList() calls used to build the mount command line
has also seen its arguments reordered; however, since the per-OS
split of output files was performed as part of the same patch instead
of in a separate one, the existing output file was not updated
accordingly.

Since you're correcting a mistake introduced in an old commit, you
can include

  Fixes: f00cde7f1133fee96dc13a80d7f402c704346974

in your commit message.

-- 
Andrea Bolognani / Red Hat / Virtualization