This test might fail if the user is not root (or sudo'd):

  fusermount3: failed to open .../scratch/qcow2-file-108/fuse-export: 
Permission denied

A check exists to try to cover for this, but there are
two potential error messages that signal this case
(per the comment block associated with the check) and
only a skip for one of them.

Update the common fuse check to include this message,
and update test 108 to utilize it.

Fixes: 9ffd6d646d ("iotests/108: Test new refcount rebuild algorithm")
Based-on: <[email protected]>
Signed-off-by: Eric Farman <[email protected]>
---
 tests/qemu-iotests/108       | 5 +----
 tests/qemu-iotests/common.rc | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index bf808b3512..5d91e58943 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -69,10 +69,7 @@ else
     # or "Invalid parameter 'fuse'", depending on whether there is
     # FUSE support or not.
     error=$($QSD --export fuse 2>&1)
-    if [[ $error = *"'fuse'"* ]]; then
-        _notrun 'Passwordless sudo for losetup or FUSE support required, but' \
-                'neither is available'
-    fi
+    _notrun_on_fuse_error "$error"
 fi
 
 echo
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index bcb1ec50a9..844c19d15a 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -986,6 +986,7 @@ _require_drivers()
 _notrun_on_fuse_error()
 {
     case "$1" in
+        *"Parameter 'id' is missing"* | \
         *"Parameter 'type' does not accept value 'fuse'"*)
             _notrun "No FUSE support"
             ;;
-- 
2.53.0


Reply via email to