From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 2 May 2018 19:50:53 +0000 (-0700)
Subject: qa: fix blacklisted check for test_lifecycle
X-Git-Tag: v12.2.6~80^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=899cc891bd2051540f95d929371129f343be279f;p=ceph.git

qa: fix blacklisted check for test_lifecycle

Caused by: 36f89c5acf0385f13be2f39bc8d30621f4bf0115

Fixes: http://tracker.ceph.com/issues/23975

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 36b51db0e648339afb5ece065b18d38f8f0c13fd)
---

diff --git a/qa/tasks/cephfs/test_volume_client.py b/qa/tasks/cephfs/test_volume_client.py
index 0876af96efe0..76de57fefc13 100644
--- a/qa/tasks/cephfs/test_volume_client.py
+++ b/qa/tasks/cephfs/test_volume_client.py
@@ -283,21 +283,21 @@ vc.disconnect()
             # it has lost network, because there is nothing to tell it that is messages
             # are being dropped because it's identity is gone)
             background = self.mounts[2].write_n_mb("rogue.bin", 1, wait=False)
-            time.sleep(10)  # Approximate check for 'stuck' as 'still running after 10s'
-            self.assertFalse(background.finished)
+            try:
+                background.wait()
+            except CommandFailedError:
+                # command failed with EBLACKLISTED?
+                if "transport endpoint shutdown" in background.stderr.getvalue():
+                    pass
+                else:
+                    raise
 
             # After deauthorisation, the client ID should be gone (this was the only
             # volume it was authorised for)
             self.assertNotIn("client.{0}".format(guest_entity), [e['entity'] for e in self.auth_list()])
 
             # Clean up the dead mount (ceph-fuse's behaviour here is a bit undefined)
-            self.mounts[2].kill()
-            self.mounts[2].kill_cleanup()
-            try:
-                background.wait()
-            except CommandFailedError:
-                # We killed the mount out from under you
-                pass
+            self.mounts[2].umount_wait()
 
         self._volume_client_python(self.mount_b, dedent("""
             vp = VolumePath("{group_id}", "{volume_id}")