From 84d7414249dc507357defbebdb693c2c70153386 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Fri, 16 Mar 2018 18:03:23 +0800 Subject: [PATCH] qa/cephfs: don't run TestSnapshots.test_kill_mdstable on kclient this test forcibly kills mount. Killing kernel mount requires reboot, Signed-off-by: "Yan, Zheng" --- qa/suites/multimds/basic/tasks/cephfs_test_snapshots.yaml | 1 + qa/tasks/cephfs/test_snapshots.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/qa/suites/multimds/basic/tasks/cephfs_test_snapshots.yaml b/qa/suites/multimds/basic/tasks/cephfs_test_snapshots.yaml index a24734b21e930..3d143585b51b9 100644 --- a/qa/suites/multimds/basic/tasks/cephfs_test_snapshots.yaml +++ b/qa/suites/multimds/basic/tasks/cephfs_test_snapshots.yaml @@ -7,5 +7,6 @@ overrides: tasks: - cephfs_test_runner: + fail_on_skip: false modules: - tasks.cephfs.test_snapshots diff --git a/qa/tasks/cephfs/test_snapshots.py b/qa/tasks/cephfs/test_snapshots.py index 511e768a7f750..db2b8f7430263 100644 --- a/qa/tasks/cephfs/test_snapshots.py +++ b/qa/tasks/cephfs/test_snapshots.py @@ -4,6 +4,7 @@ from textwrap import dedent from tasks.cephfs.fuse_mount import FuseMount from tasks.cephfs.cephfs_test_case import CephFSTestCase from teuthology.orchestra.run import CommandFailedError, Raw +from unittest import SkipTest log = logging.getLogger(__name__) @@ -47,6 +48,9 @@ class TestSnapshots(CephFSTestCase): """ check snaptable transcation """ + if not isinstance(self.mount_a, FuseMount): + raise SkipTest("Require FUSE client to forcibly kill mount") + self.fs.set_allow_new_snaps(True); self.fs.set_max_mds(2) self.fs.wait_for_daemons() -- 2.39.5