From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 1 Jan 2016 17:05:26 +0000 (+0100)
Subject: tests: ceph-disk deactivate takes the activate lock
X-Git-Tag: v10.0.4~46^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9429c0402ef889fd98723141ffa526e1d7725245;p=ceph.git

tests: ceph-disk deactivate takes the activate lock

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/test/python/ceph-disk/tests/test_ceph_disk.py b/src/test/python/ceph-disk/tests/test_ceph_disk.py
index c3506c7b53b0..8bbeeab51dc5 100644
--- a/src/test/python/ceph-disk/tests/test_ceph_disk.py
+++ b/src/test/python/ceph-disk/tests/test_ceph_disk.py
@@ -706,6 +706,7 @@ class TestCephDiskDeactivateAndDestroy(unittest.TestCase):
                 ceph_disk,
                 list_devices=lambda dev:fake_device,
                 ):
+            ceph_disk.setup_statedir(ceph_disk.STATEDIR)
             self.assertRaises(Exception, ceph_disk.main_deactivate, args)
 
         #
@@ -730,6 +731,7 @@ class TestCephDiskDeactivateAndDestroy(unittest.TestCase):
                 _check_osd_status=lambda cluster, osd_id: 2,
                 _mark_osd_out=lambda cluster, osd_id: True
                 ):
+            ceph_disk.setup_statedir(ceph_disk.STATEDIR)
             ceph_disk.main_deactivate(args)
 
         #
@@ -751,6 +753,7 @@ class TestCephDiskDeactivateAndDestroy(unittest.TestCase):
                 list_devices=lambda dev:fake_device,
                 _check_osd_status=lambda cluster, osd_id: 0,
                 ):
+            ceph_disk.setup_statedir(ceph_disk.STATEDIR)
             ceph_disk.main_deactivate(args)
 
         #
@@ -787,6 +790,7 @@ class TestCephDiskDeactivateAndDestroy(unittest.TestCase):
                 unmount=lambda path: True,
                 dmcrypt_unmap=lambda part_uuid: True,
                 ):
+            ceph_disk.setup_statedir(ceph_disk.STATEDIR)
             ceph_disk.main_deactivate(args)
 
         #
@@ -821,6 +825,7 @@ class TestCephDiskDeactivateAndDestroy(unittest.TestCase):
                 unmount=lambda path: True,
                 dmcrypt_unmap=lambda part_uuid: True,
                 ):
+            ceph_disk.setup_statedir(ceph_disk.STATEDIR)
             ceph_disk.main_deactivate(args)
 
     def test_mark_out_out(self):