From 0ee2f8036775052623a3952e1979d8397b3dfbb8 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Tue, 31 Jan 2023 10:12:51 +0800 Subject: [PATCH] qa: add require_kernel_mount helper support This will simplify the code later. Signed-off-by: Xiubo Li --- qa/tasks/cephfs/test_fscrypt.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- 2.39.5