tasks/cephfs: fix wait in test_volume_client

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

diff --git a/tasks/cephfs/test_volume_client.py b/tasks/cephfs/test_volume_client.py
index 76532574ba5d02da2f5c81a49c87e908cdf92f6e..10b5cb81ab6f98f2aba98431be27d7ff80d933ea 100644 (file)
--- 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}")