]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: mokeypatch calls to lvm related binaries 31405/head
authorJan Fajerski <jfajerski@suse.com>
Mon, 28 Oct 2019 14:33:24 +0000 (15:33 +0100)
committerNathan Cutler <ncutler@suse.com>
Tue, 5 Nov 2019 11:35:25 +0000 (12:35 +0100)
Otherwise these tests fail occasionally when run on a system that does
not have lvm installed.

Fixes: https://tracker.ceph.com/issues/42045
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2029a99025e164f72ed2ac566ca53072d8234ecf)

src/ceph-volume/ceph_volume/tests/api/test_lvm.py
src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py

index 9cfe48a7933a701bc2eb17d6ca77773778307de7..223ac501382f99641260ccf79bed5f133c8f8000 100644 (file)
@@ -928,6 +928,7 @@ class TestSplitNameParser(object):
 class TestIsLV(object):
 
     def test_is_not_an_lv(self, monkeypatch):
+        monkeypatch.setattr(api.process, 'call', lambda x, **kw: ('', '', 0))
         monkeypatch.setattr(api, 'dmsetup_splitname', lambda x, **kw: {})
         assert api.is_lv('/dev/sda1', lvs=[]) is False
 
index 8df5840b6527b9b83c49b2c9ed876a77cff54c33..69be0d5c0a348233c208021a2207b1febc0930a2 100644 (file)
@@ -1,5 +1,6 @@
 import pytest
 from ceph_volume.devices.lvm.strategies import bluestore
+from ceph_volume.api import lvm
 
 
 class TestSingleType(object):
@@ -51,7 +52,7 @@ class TestSingleType(object):
 
 class TestMixedType(object):
 
-    def test_filter_all_data_devs(self, fakedevice, factory):
+    def test_filter_all_data_devs(self, fakedevice, factory, monkeypatch):
         # in this scenario the user passed a already used device to be used for
         # data and an unused device to be used as db device.
         db_dev = fakedevice(used_by_ceph=False, is_lvm_member=False, rotational=False, sys_api=dict(size=6073740000))
@@ -59,6 +60,7 @@ class TestMixedType(object):
         args = factory(filtered_devices=[data_dev], osds_per_device=1,
                        block_db_size=None, block_wal_size=None,
                        osd_ids=[])
+        monkeypatch.setattr(lvm, 'VolumeGroup', lambda x, **kw: [])
         bluestore.MixedType(args, [], [db_dev], [])