From 5c525219c45cfb8027229376666221d6c303f0b0 Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 3 Dec 2015 10:58:23 +0000 Subject: [PATCH] tasks/cephfs: fix wait in test_volume_client Signed-off-by: John Spray --- tasks/cephfs/test_volume_client.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tasks/cephfs/test_volume_client.py b/tasks/cephfs/test_volume_client.py index 76532574ba5d0..10b5cb81ab6f9 100644 --- a/tasks/cephfs/test_volume_client.py +++ b/tasks/cephfs/test_volume_client.py @@ -4,6 +4,7 @@ import time import os from textwrap import dedent from tasks.cephfs.cephfs_test_case import CephFSTestCase +from teuthology.exceptions import CommandFailedError log = logging.getLogger(__name__) @@ -156,7 +157,11 @@ vc.disconnect() # Clean up the dead mount (ceph-fuse's behaviour here is a bit undefined) self.mounts[2].kill() self.mounts[2].kill_cleanup() - background.wait() + try: + background.wait() + except CommandFailedError: + # We killed the mount out from under you + pass self._volume_client_python(self.mount_b, dedent(""" vp = VolumePath("{group_id}", "{volume_id}") -- 2.39.5