From: Alfredo Deza Date: Fri, 30 Nov 2018 17:31:02 +0000 (-0500) Subject: ceph-volume tests patch udevadm so it doesn't actually call udevadm in a test X-Git-Tag: v13.2.5~144^2~2^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25351%2Fhead;p=ceph.git ceph-volume tests patch udevadm so it doesn't actually call udevadm in a test Signed-off-by: Alfredo Deza (cherry picked from commit 9f440fb96694e38f69e174c01f284ab9a2066bc8) --- diff --git a/src/ceph-volume/ceph_volume/tests/conftest.py b/src/ceph-volume/ceph_volume/tests/conftest.py index cf7dd5d8fc55..8ec99bb8469c 100644 --- a/src/ceph-volume/ceph_volume/tests/conftest.py +++ b/src/ceph-volume/ceph_volume/tests/conftest.py @@ -192,10 +192,11 @@ def tmpfile(tmpdir): @pytest.fixture def device_info(monkeypatch): - def apply(devices=None, lsblk=None, lv=None, blkid=None): + def apply(devices=None, lsblk=None, lv=None, blkid=None, udevadm=None): devices = devices if devices else {} lsblk = lsblk if lsblk else {} blkid = blkid if blkid else {} + udevadm = udevadm if udevadm 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) @@ -206,4 +207,5 @@ def device_info(monkeypatch): monkeypatch.setattr("ceph_volume.util.device.lvm.get_lv", lambda vg_name, lv_uuid: lv) monkeypatch.setattr("ceph_volume.util.device.disk.lsblk", lambda path: lsblk) monkeypatch.setattr("ceph_volume.util.device.disk.blkid", lambda path: blkid) + monkeypatch.setattr("ceph_volume.util.disk.udevadm_property", lambda *a, **kw: udevadm) return apply