From 040de3fe4643a2e859f22e31415e479e99e52347 Mon Sep 17 00:00:00 2001 From: Roman Bolshakov Date: Tue, 3 Nov 2020 17:26:30 +0300 Subject: [PATCH] storagepoolxml2argvtest: Reorder gluster arguments Commit f00cde7f1133 changed order of mount arguments in virStorageBackendFileSystemMountGlusterArgs() and introduced per-OS mount options and new test data. Old test data was left unmodified with prior order of arguments. That causes a test failure on all OSes but Linux and FreeBSD, i.e. on macOS: 15) Storage Pool XML-2-argv pool-netfs-gluster ... In '/Users/roolebo/dev/libvirt/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv': Offset 39 Expect [-o direct-io-mode=1 /mnt/gluster] Actual [/mnt/gluster -o direct-io-mode=1] Fixes: f00cde7f1133 ("storage: Add default mount options for fs/netfs storage pools") Signed-off-by: Roman Bolshakov Reviewed-by: Andrea Bolognani --- tests/storagepoolxml2argvdata/pool-netfs-gluster.argv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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