RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-04 23:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa: fix blacklisted check for test_lifecycle

Browse Source 
Caused by: 36f89c5acf

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

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-05-02 12:50:53 -07:00
parent fc410f3557
commit 36b51db0e6
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qa/tasks/cephfs/test_volume_client.py
View File

@ -283,21 +283,21 @@ vc.disconnect()
# it has lost network, because there is nothing to tell it that is messages # it has lost network, because there is nothing to tell it that is messages
# are being dropped because it's identity is gone) # are being dropped because it's identity is gone)
background = self.mounts[2].write_n_mb("rogue.bin", 1, wait=False) background = self.mounts[2].write_n_mb("rogue.bin", 1, wait=False)
time.sleep(10) # Approximate check for 'stuck' as 'still running after 10s' try:
self.assertFalse(background.finished) 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 # After deauthorisation, the client ID should be gone (this was the only
# volume it was authorised for) # volume it was authorised for)
self.assertNotIn("client.{0}".format(guest_entity), [e['entity'] for e in self.auth_list()]) 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) # Clean up the dead mount (ceph-fuse's behaviour here is a bit undefined)
self.mounts[2].kill() self.mounts[2].umount_wait()
self.mounts[2].kill_cleanup()
try:
background.wait()
except CommandFailedError:
# We killed the mount out from under you
pass
self._volume_client_python(self.mount_b, dedent(""" self._volume_client_python(self.mount_b, dedent("""
vp = VolumePath("{group_id}", "{volume_id}") vp = VolumePath("{group_id}", "{volume_id}")