From 690cc0eb72664a55962bfdc4f34cbb3d52886841 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 31 Jul 2018 08:26:57 -0500 Subject: [PATCH] ceph-volume: move pvolumes fixture into conftest.py Signed-off-by: Andrew Schoen (cherry picked from commit 37ed1be08b226a5b3a7a5bb70c4d5d1fd22db5d1) --- src/ceph-volume/ceph_volume/tests/api/test_lvm.py | 8 -------- src/ceph-volume/ceph_volume/tests/conftest.py | 8 ++++++++ 2 files changed, 8 insertions(+), 8 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 7d943ea29e742..0ec9263073c13 100644 --- a/src/ceph-volume/ceph_volume/tests/api/test_lvm.py +++ b/src/ceph-volume/ceph_volume/tests/api/test_lvm.py @@ -88,14 +88,6 @@ def volumes(monkeypatch): return volumes -@pytest.fixture -def pvolumes(monkeypatch): - monkeypatch.setattr(process, 'call', lambda x: ('', '', 0)) - pvolumes = api.PVolumes() - pvolumes._purge() - return pvolumes - - @pytest.fixture def volume_groups(monkeypatch): monkeypatch.setattr(process, 'call', lambda x: ('', '', 0)) diff --git a/src/ceph-volume/ceph_volume/tests/conftest.py b/src/ceph-volume/ceph_volume/tests/conftest.py index fe93d4dbe8020..11e1c1a781e0a 100644 --- a/src/ceph-volume/ceph_volume/tests/conftest.py +++ b/src/ceph-volume/ceph_volume/tests/conftest.py @@ -117,6 +117,14 @@ def volume_groups(monkeypatch): return vgs +@pytest.fixture +def pvolumes(monkeypatch): + monkeypatch.setattr('ceph_volume.process.call', lambda x: ('', '', 0)) + pvolumes = lvm_api.PVolumes() + pvolumes._purge() + return pvolumes + + @pytest.fixture def is_root(monkeypatch): """ -- 2.39.5