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:
Sebastian Wagner 2021-01-15 10:38:05 +01:00 committed by GitHub
commit 05f3b1d958
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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())