From: Xiubo Li <xiubli@redhat.com>
Date: Tue, 31 Jan 2023 02:12:51 +0000 (+0800)
Subject: qa: add require_kernel_mount helper support
X-Git-Tag: v18.1.0~320^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0ee2f8036775052623a3952e1979d8397b3dfbb8;p=ceph-ci.git

qa: add require_kernel_mount helper support

This will simplify the code later.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_fscrypt.py b/qa/tasks/cephfs/test_fscrypt.py
index 33a5878ea2c..022574b79fd 100644
--- a/qa/tasks/cephfs/test_fscrypt.py
+++ b/qa/tasks/cephfs/test_fscrypt.py
@@ -12,7 +12,7 @@ class TestFscrypt(XFSTestsDev):
     def setup_xfsprogs_devs(self):
         self.install_xfsprogs = True
 
-    def test_fscrypt_encrypt(self):
+    def require_kernel_mount(self):
         from tasks.cephfs.fuse_mount import FuseMount
         from tasks.cephfs.kernel_mount import KernelMount
 
@@ -20,12 +20,14 @@ class TestFscrypt(XFSTestsDev):
         # remounts CephFS before running tests using kernel, so ceph-fuse
         # mounts are never actually tested.
         if isinstance(self.mount_a, FuseMount):
-            log.info('client is fuse mounted')
             self.skipTest('Requires kernel client; xfstests-dev not '\
                           'compatible with ceph-fuse ATM.')
         elif isinstance(self.mount_a, KernelMount):
             log.info('client is kernel mounted')
 
+    def test_fscrypt_encrypt(self):
+        self.require_kernel_mount()
+
         # XXX: check_status is set to False so that we can check for command's
         # failure on our own (since this command doesn't set right error code
         # and error message in some cases) and print custom log messages