From 1a89ccdc72b65dd83332425f7103299036f9eee2 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 3 Oct 2019 17:44:37 +0530 Subject: [PATCH] ceph-volume: update tests since VolumeGroups.filter returns a list VolumeGroups.filter returns VolumeGroups object that contains VGs matching the filter. Update the tests to hold the list returned by the Volumes.filter() call. Signed-off-by: Rishabh Dave (cherry picked from commit da58d239a0e067cd3ea5fd26aac24a2551b871c1) --- src/ceph-volume/ceph_volume/tests/api/test_lvm.py | 8 ++++---- src/ceph-volume/ceph_volume/tests/conftest.py | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/api/test_lvm.py b/src/ceph-volume/ceph_volume/tests/api/test_lvm.py index ddf99f6ae1f80..0c883a1c72d5b 100644 --- a/src/ceph-volume/ceph_volume/tests/api/test_lvm.py +++ b/src/ceph-volume/ceph_volume/tests/api/test_lvm.py @@ -337,7 +337,7 @@ class TestVolumeGroups(object): journal = api.VolumeGroup(vg_name='volume2', vg_tags='ceph.group=plain') volume_groups.append(osd) volume_groups.append(journal) - volume_groups.filter(vg_tags={'ceph.group': 'dmcache'}) + volume_groups = volume_groups.filter(vg_tags={'ceph.group': 'dmcache'}) assert len(volume_groups) == 1 assert volume_groups[0].vg_name == 'volume1' @@ -345,7 +345,7 @@ class TestVolumeGroups(object): vg_tags = "ceph.group=dmcache,ceph.disk_type=ssd" osd = api.VolumeGroup(vg_name='volume1', vg_path='/dev/vg/lv', vg_tags=vg_tags) volume_groups.append(osd) - volume_groups.filter(vg_tags={'ceph.group': 'data', 'ceph.disk_type': 'ssd'}) + volume_groups = volume_groups.filter(vg_tags={'ceph.group': 'data', 'ceph.disk_type': 'ssd'}) assert volume_groups == [] def test_filter_by_vg_name(self, volume_groups): @@ -354,13 +354,13 @@ class TestVolumeGroups(object): journal = api.VolumeGroup(vg_name='volume2', vg_tags='ceph.type=journal') volume_groups.append(osd) volume_groups.append(journal) - volume_groups.filter(vg_name='ceph_vg') + volume_groups = volume_groups.filter(vg_name='ceph_vg') assert len(volume_groups) == 1 assert volume_groups[0].vg_name == 'ceph_vg' def test_filter_requires_params(self, volume_groups): with pytest.raises(TypeError): - volume_groups.filter() + volume_groups = volume_groups.filter() class TestVolumeGroupFree(object): diff --git a/src/ceph-volume/ceph_volume/tests/conftest.py b/src/ceph-volume/ceph_volume/tests/conftest.py index fad7df44e305d..07864da70726c 100644 --- a/src/ceph-volume/ceph_volume/tests/conftest.py +++ b/src/ceph-volume/ceph_volume/tests/conftest.py @@ -153,6 +153,10 @@ def volume_groups(monkeypatch): vgs._purge() return vgs +def volume_groups_empty(monkeypatch): + monkeypatch.setattr('ceph_volume.process.call', lambda x, **kw: ('', '', 0)) + vgs = lvm_api.VolumeGroups(populate=False) + return vgs @pytest.fixture def stub_vgs(monkeypatch, volume_groups): -- 2.39.5