mirror of
https://github.com/ceph/ceph
synced 2025-02-21 18:17:42 +00:00
Merge pull request #38919 from tchaikov/wip-cephadm-yield_fixture
mgr/cephadm: s/yield_fixture/fixture/ Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
commit
05f3b1d958
@ -65,13 +65,13 @@ def with_cephadm_module(module_options=None, store=None):
|
||||
yield m
|
||||
|
||||
|
||||
@pytest.yield_fixture()
|
||||
@pytest.fixture()
|
||||
def cephadm_module():
|
||||
with with_cephadm_module({}) as m:
|
||||
yield m
|
||||
|
||||
|
||||
@pytest.yield_fixture()
|
||||
@pytest.fixture()
|
||||
def rm_util():
|
||||
with with_cephadm_module({}) as m:
|
||||
r = RemoveUtil.__new__(RemoveUtil)
|
||||
@ -79,7 +79,7 @@ def rm_util():
|
||||
yield r
|
||||
|
||||
|
||||
@pytest.yield_fixture()
|
||||
@pytest.fixture()
|
||||
def osd_obj():
|
||||
with mock.patch("cephadm.services.osd.RemoveUtil"):
|
||||
o = OSD(0, mock.MagicMock())
|
||||
|
Loading…
Reference in New Issue
Block a user