tasks/cephfs: skip test_client_abort on kclient

This tests a fuse-only feature, ticket for adding
it in kclient is:
http://tracker.ceph.com/issues/17805

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/suites/kcephfs/recovery/tasks/failover.yaml b/suites/kcephfs/recovery/tasks/failover.yaml
index 8f3d5e1a9bf9cd4cded0ea0e86b72fafdb1c63ed..b06985336c93555d11caf06ee430bcb86caf4873 100644 (file)
--- a/suites/kcephfs/recovery/tasks/failover.yaml
+++ b/suites/kcephfs/recovery/tasks/failover.yaml
@@ -1,6 +1,7 @@
 
 tasks:
   - cephfs_test_runner:
+      fail_on_skip: false
       modules:
         - tasks.cephfs.test_failover
 

diff --git a/tasks/cephfs/test_failover.py b/tasks/cephfs/test_failover.py
index b9dd582f261f2139238151a717a5919222b127ad..77d2fbdf3a778228bc9e9a9357d20165e5d4e3fa 100644 (file)
--- a/tasks/cephfs/test_failover.py
+++ b/tasks/cephfs/test_failover.py
@@ -1,10 +1,12 @@
 import json
 import logging
-from unittest import case
+from unittest import case, SkipTest
+
 from cephfs_test_case import CephFSTestCase
 from teuthology.exceptions import CommandFailedError
 from tasks.ceph_manager import CephManager
 from teuthology import misc as teuthology
+from tasks.cephfs.fuse_mount import FuseMount
 
 log = logging.getLogger(__name__)
 
@@ -57,6 +59,9 @@ class TestFailover(CephFSTestCase):
         when the cluster appears to be unavailable.
         """
 
+        if not isinstance(self.mount_a, FuseMount):
+            raise SkipTest("Requires FUSE client to inject client metadata")
+
         require_active = self.fs.get_config("fuse_require_active_mds", service_type="mon").lower() == "true"
         if not require_active:
             raise case.SkipTest("fuse_require_active_mds is not set")