From 5798d1e76c380182472d08ec6f62ebe0f1a9897e Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 6 Jan 2016 23:36:57 +0100 Subject: [PATCH] tests: ceph-disk cryptsetup close must try harder Similar to how it's done in dmcrpyt_unmap in master ( 132e56615805cba0395898cf165b32b88600d633 ), the infernalis tests helper that were deprecated by the addition of the deactivate / destroy ceph-disk subcommand must try cryptsetup close a few times in some contexts. Signed-off-by: Loic Dachary --- qa/workunits/ceph-disk/ceph-disk-test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qa/workunits/ceph-disk/ceph-disk-test.py b/qa/workunits/ceph-disk/ceph-disk-test.py index a2bbd018d30a..0336e44a6335 100644 --- a/qa/workunits/ceph-disk/ceph-disk-test.py +++ b/qa/workunits/ceph-disk/ceph-disk-test.py @@ -157,6 +157,7 @@ class CephDisk: if partition['dmcrypt']: holder = partition['dmcrypt']['holders'][0] self.sh("cryptsetup close $(cat /sys/block/" + holder + "/dm/name) || true") + self.sh("cryptsetup close $(cat /sys/block/" + holder + "/dm/name) || true") except: pass try: @@ -166,6 +167,7 @@ class CephDisk: if partition['dmcrypt']: holder = partition['dmcrypt']['holders'][0] self.sh("cryptsetup close $(cat /sys/block/" + holder + "/dm/name) || true") + self.sh("cryptsetup close $(cat /sys/block/" + holder + "/dm/name) || true") except: pass self.sh(""" -- 2.47.3