]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume tests allow **kw when monkeypatching
authorAlfredo Deza <adeza@redhat.com>
Wed, 24 Oct 2018 14:54:48 +0000 (10:54 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 24 Oct 2018 16:25:53 +0000 (12:25 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 04e51c956eadcbd38f39ec3dd4b78009d2cd4a70)

src/ceph-volume/ceph_volume/tests/conftest.py

index 4af388662d76d78666ae78c17b2e98709c4cc01f..cf7dd5d8fc55f2f11817dfe7dc049ccc8037bebb 100644 (file)
@@ -137,7 +137,7 @@ def conf_ceph_stub(monkeypatch, tmpfile):
 
 @pytest.fixture
 def volumes(monkeypatch):
-    monkeypatch.setattr('ceph_volume.process.call', lambda x: ('', '', 0))
+    monkeypatch.setattr('ceph_volume.process.call', lambda x, **kw: ('', '', 0))
     volumes = lvm_api.Volumes()
     volumes._purge()
     return volumes
@@ -145,7 +145,7 @@ def volumes(monkeypatch):
 
 @pytest.fixture
 def volume_groups(monkeypatch):
-    monkeypatch.setattr('ceph_volume.process.call', lambda x: ('', '', 0))
+    monkeypatch.setattr('ceph_volume.process.call', lambda x, **kw: ('', '', 0))
     vgs = lvm_api.VolumeGroups()
     vgs._purge()
     return vgs
@@ -160,7 +160,7 @@ def stub_vgs(monkeypatch, volume_groups):
 
 @pytest.fixture
 def pvolumes(monkeypatch):
-    monkeypatch.setattr('ceph_volume.process.call', lambda x: ('', '', 0))
+    monkeypatch.setattr('ceph_volume.process.call', lambda x, **kw: ('', '', 0))
     pvolumes = lvm_api.PVolumes()
     pvolumes._purge()
     return pvolumes