From 350d7cf28185d5d003d18c4f2ff38a0bcfea966c Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 24 Sep 2018 10:34:55 -0400 Subject: [PATCH] ceph-volume tests.devices patch configuration.load to avoid raising non-existing ceph.conf Signed-off-by: Alfredo Deza (cherry picked from commit fe80e5399e9dd1f6b9f94404d732a76f961d9eb4) --- .../ceph_volume/tests/devices/lvm/test_activate.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py index 45d7b7191cd1b..07fdd87850418 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py @@ -50,6 +50,7 @@ class TestActivate(object): activate.Activate([]).activate(args) def test_filestore_no_systemd(self, is_root, volumes, monkeypatch, capture): + monkeypatch.setattr('ceph_volume.configuration.load', lambda: None) fake_enable = Capture() fake_start_osd = Capture() monkeypatch.setattr('ceph_volume.util.system.device_is_mounted', lambda *a, **kw: True) @@ -64,8 +65,8 @@ class TestActivate(object): lv_tags=','.join([ "ceph.cluster_name=ceph", "ceph.journal_device=/dev/vg/journal", "ceph.journal_uuid=000", "ceph.type=journal", - "ceph.osd_id=0","ceph.osd_fsid=1234"]) - ) + "ceph.osd_id=0", "ceph.osd_fsid=1234"]) + ) DataVolume = api.Volume( lv_name='data', lv_path='/dev/vg/data', @@ -81,6 +82,7 @@ class TestActivate(object): def test_filestore_systemd(self, is_root, volumes, monkeypatch, capture): fake_enable = Capture() fake_start_osd = Capture() + monkeypatch.setattr('ceph_volume.configuration.load', lambda: None) monkeypatch.setattr('ceph_volume.util.system.device_is_mounted', lambda *a, **kw: True) monkeypatch.setattr('ceph_volume.util.system.chown', lambda *a, **kw: True) monkeypatch.setattr('ceph_volume.process.run', lambda *a, **kw: True) -- 2.39.5