From: Alfredo Deza Date: Thu, 27 Sep 2018 20:15:00 +0000 (-0400) Subject: ceph-volume tests.conftest add blkid patching to device_info fixture X-Git-Tag: v12.2.9~50^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6d42cbc98e33fd2287b34a0a6dcb0e4a84c7e5d;p=ceph.git ceph-volume tests.conftest add blkid patching to device_info fixture Signed-off-by: Alfredo Deza (cherry picked from commit 5bfc8c26e639dba955f83f53893ce311e6e047f1) --- diff --git a/src/ceph-volume/ceph_volume/tests/conftest.py b/src/ceph-volume/ceph_volume/tests/conftest.py index dfa84e567703..1df4743e68ce 100644 --- a/src/ceph-volume/ceph_volume/tests/conftest.py +++ b/src/ceph-volume/ceph_volume/tests/conftest.py @@ -192,12 +192,14 @@ def tmpfile(tmpdir): @pytest.fixture def device_info(monkeypatch): - def apply(devices=None, lsblk=None, lv=None): + def apply(devices=None, lsblk=None, lv=None, blkid=None): devices = devices if devices else {} lsblk = lsblk if lsblk else {} + blkid = blkid if blkid else {} lv = Factory(**lv) if lv else None monkeypatch.setattr("ceph_volume.sys_info.devices", {}) monkeypatch.setattr("ceph_volume.util.device.disk.get_devices", lambda: devices) monkeypatch.setattr("ceph_volume.util.device.lvm.get_lv_from_argument", lambda path: lv) monkeypatch.setattr("ceph_volume.util.device.disk.lsblk", lambda path: lsblk) + monkeypatch.setattr("ceph_volume.util.device.disk.blkid", lambda path: blkid) return apply