]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume tests check success message when zapping
authorAlfredo Deza <adeza@redhat.com>
Tue, 20 Aug 2019 12:04:26 +0000 (08:04 -0400)
committerAlfredo Deza <adeza@redhat.com>
Thu, 29 Aug 2019 20:39:43 +0000 (16:39 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 88c7429a60fdab6222d14132bea93b9bf773c720)

src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py

index 55daa4f87c8c3d59853f9a0a62c3b3eb103c00b4..7b5a2ea88d5292990cfbfd5dc245f74e2358682d 100644 (file)
@@ -90,6 +90,22 @@ class TestEnsureAssociatedLVs(object):
         result = zap.ensure_associated_lvs(volumes)
         assert result == ['/dev/VolGroup/block']
 
+    def test_success_message_for_fsid(self, factory, is_root, capsys):
+        cli_zap = zap.Zap([])
+        args = factory(devices=[], osd_id=None, osd_fsid='asdf-lkjh')
+        cli_zap.args = args
+        cli_zap.zap()
+        out, err = capsys.readouterr()
+        assert "Zapping successful for OSD: asdf-lkjh" in err
+
+    def test_success_message_for_id(self, factory, is_root, capsys):
+        cli_zap = zap.Zap([])
+        args = factory(devices=[], osd_id='1', osd_fsid=None)
+        cli_zap.args = args
+        cli_zap.zap()
+        out, err = capsys.readouterr()
+        assert "Zapping successful for OSD: 1" in err
+
     def test_block_and_partition_are_found(self, volumes, monkeypatch):
         monkeypatch.setattr(zap.disk, 'get_device_from_partuuid', lambda x: '/dev/sdb1')
         tags = 'ceph.osd_id=0,ceph.osd_fsid=asdf-lkjh,ceph.journal_uuid=x,ceph.type=block'