]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
tests: ceph-disk deactivate takes the activate lock
authorLoic Dachary <ldachary@redhat.com>
Fri, 1 Jan 2016 17:05:26 +0000 (18:05 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 4 Feb 2016 07:36:37 +0000 (14:36 +0700)
Signed-off-by: Loic Dachary <loic@dachary.org>
src/test/python/ceph-disk/tests/test_ceph_disk.py

index c3506c7b53b03bc9ba696cae8d6778f910ff753d..8bbeeab51dc5ee7d6bd2f4cd8689caf3367f8d4a 100644 (file)
@@ -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):