From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 6 Jan 2016 22:36:57 +0000 (+0100)
Subject: tests: ceph-disk cryptsetup close must try harder
X-Git-Tag: v9.2.1~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5798d1e76c380182472d08ec6f62ebe0f1a9897e;p=ceph.git

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 <loic@dachary.org>
---

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("""