]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: remove the FuseMount/KernelMount check in test_fscrypt.py
authorXiubo Li <xiubli@redhat.com>
Wed, 29 Mar 2023 04:51:44 +0000 (12:51 +0800)
committerXiubo Li <xiubli@redhat.com>
Tue, 18 Jun 2024 12:09:38 +0000 (20:09 +0800)
Will use the postmerge fragment to check this.

Fixes: https://tracker.ceph.com/issues/59195
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit f52f1316b7a254d57b4ebbc844910a1dacb3174f)

qa/tasks/cephfs/test_fscrypt.py

index 11dd2038f92888e4c4a60e1b0fc9e7f4fd740d7f..a1836717f2a91bbca13e87ebd63f2dd62072dcda 100644 (file)
@@ -12,22 +12,7 @@ class TestFscrypt(XFSTestsDev):
     def setup_xfsprogs_devs(self):
         self.install_xfsprogs = True
 
-    def require_kernel_mount(self):
-        from tasks.cephfs.fuse_mount import FuseMount
-        from tasks.cephfs.kernel_mount import KernelMount
-
-        # TODO: make xfstests-dev compatible with ceph-fuse. xfstests-dev
-        # remounts CephFS before running tests using kernel, so ceph-fuse
-        # mounts are never actually tested.
-        if isinstance(self.mount_a, FuseMount):
-            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
@@ -51,8 +36,6 @@ class TestFscrypt(XFSTestsDev):
         self.assertIn('Passed all 26 tests', stdout)
 
     def test_fscrypt_dummy_encryption_with_quick_group(self):
-        self.require_kernel_mount()
-
         self.write_local_config('test_dummy_encryption')
 
         # XXX: check_status is set to False so that we can check for command's