]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume tests patch udevadm so it doesn't actually call udevadm in a test 25330/head
authorAlfredo Deza <adeza@redhat.com>
Fri, 30 Nov 2018 17:31:02 +0000 (12:31 -0500)
committerAlfredo Deza <adeza@redhat.com>
Fri, 30 Nov 2018 17:31:02 +0000 (12:31 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
src/ceph-volume/ceph_volume/tests/conftest.py

index cf7dd5d8fc55f2f11817dfe7dc049ccc8037bebb..8ec99bb8469c4f453515affb444c83a94d4f40df 100644 (file)
@@ -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