From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 31 Jul 2018 13:26:57 +0000 (-0500)
Subject: ceph-volume: move pvolumes fixture into conftest.py
X-Git-Tag: v13.2.2~119^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=690cc0eb72664a55962bfdc4f34cbb3d52886841;p=ceph.git

ceph-volume: move pvolumes fixture into conftest.py

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 37ed1be08b226a5b3a7a5bb70c4d5d1fd22db5d1)
---

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 7d943ea29e7..0ec9263073c 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 fe93d4dbe80..11e1c1a781e 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):
     """