From e486d95e7e0b94fed3bb0e94a3d419416b35de42 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 20 Aug 2019 08:04:26 -0400 Subject: [PATCH] ceph-volume tests check success message when zapping Signed-off-by: Alfredo Deza (cherry picked from commit 88c7429a60fdab6222d14132bea93b9bf773c720) --- .../ceph_volume/tests/devices/lvm/test_zap.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py index 55daa4f87c8c3..7b5a2ea88d529 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py @@ -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' -- 2.39.5